bump version, requirements

2004-04-02 JP Rosevear <jpr@ximian.com> * configure.in: bump version, requirements svn path=/trunk/; revision=25301
author: JP Rosevear <jpr@ximian.com> 2004-04-03 00:33:55 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2004-04-03 00:33:55 +0800
commit: 5748693354eb261e91fd9648a0ae6cdbbfdefbd9 (patch)
tree: 3229ee1db67a670b275dd2043217fb1c809df88b /po
parent: 8cc048dc72218fcd37c3a77297bf5a14bb7347bc (diff)
download: gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.gz
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.zst
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.zip
48 files changed, 108242 insertions, 92696 deletions
diff --git a/po/am.po b/po/am.po
index 84904eafd5..61ec2a06e8 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -15,6 +15,43 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "አድራሻ"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+msgid "current addressbook folder "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "በሌላ ስም አስቀምጥ"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr " እና "
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -93,81 +130,97 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "ምርጫዎች..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "ወር"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 #, fuzzy
 msgid "_Contact"
 msgstr "ወር"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 #, fuzzy
 msgid "Create a new contact"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "አልተገኘም"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "አድራሻ"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "አድራሻ"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -193,17 +246,17 @@ msgstr ""
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "የግል"
 
@@ -250,53 +303,53 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr ""
 
@@ -319,16 +372,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -343,62 +390,53 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "ቀን መቁጠሪያ"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "አድራሻ"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "ሁል ጊዜ"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -406,52 +444,52 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "ጨርሷል"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "በፍጹም"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -461,30 +499,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "አንድ"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "ተመርጠዋል፦"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -495,7 +529,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -504,7 +538,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -512,40 +546,40 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "የኩነቶች መረጃ"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -554,7 +588,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -562,7 +596,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -572,7 +606,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -582,41 +616,41 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -624,28 +658,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -653,60 +687,48 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "አስተካክል"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "የ_ፖርት ቍጥር፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr ""
 
@@ -738,7 +760,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr ""
 
@@ -754,7 +776,7 @@ msgstr "ስም"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "ምንጭ"
 
@@ -829,7 +851,8 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr ""
 
@@ -838,7 +861,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "ዝርዝሮች"
@@ -920,16 +943,27 @@ msgstr "ምድብ... (_T)"
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "አጥፉ"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "አስተካክል"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
@@ -974,22 +1008,22 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "አድራሻ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr ""
 
@@ -1976,9 +2010,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr ""
 
@@ -1992,21 +2026,22 @@ msgid "MSN Messenger"
 msgstr "መልዕክቶች"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "_የሰርቨር ስም፦"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "ቦታ፦"
@@ -2017,110 +2052,98 @@ msgid "Username"
 msgstr "የተጠቃሚ ስም"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "መጀመሪያ"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "መሥራት"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "ሌላ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "ምንጭ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "ስልክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2135,6 +2158,7 @@ msgid "_Edit Full"
 msgstr "አስተካክል"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Full Name:"
 msgstr "ሙሉ ስም"
@@ -2144,6 +2168,18 @@ msgstr "ሙሉ ስም"
 msgid "E-_mail:"
 msgstr "ኢሜይል፦"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "አድራሻ"
@@ -2248,24 +2284,28 @@ msgid "_Title:"
 msgstr "አርእስት"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-#, fuzzy
-msgid "Account name:"
-msgstr "የመድረክ ስም"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr ""
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "የመድረክ ስም"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "_የሰርቨር ስም፦"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "ቦታ፦"
 
+#: 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 ""
@@ -2287,25 +2327,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2353,24 +2394,21 @@ msgid "No contacts"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "ወር"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "%d ሴኮንዶች"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d ሴኮንዶች"
+msgstr[1] "%d ሴኮንዶች"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr ""
 
@@ -2382,133 +2420,132 @@ msgstr "ሞዴል"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "ጠለቅ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "ዓይነት"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "ከውጭ አስገባ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "አትም"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ቁረጥ"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ቅጂ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2517,7 +2554,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
@@ -2551,8 +2588,6 @@ msgid "Car Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "ምድቦች"
 
@@ -2561,7 +2596,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "ኢሜይል"
 
@@ -2615,6 +2650,7 @@ msgid "Manager"
 msgstr "መቆጣጠሪያ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr ""
 
@@ -2623,7 +2659,7 @@ msgid "Nickname"
 msgstr "ቅጽል ስም"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "ማስታወሻ"
 
@@ -2632,7 +2668,7 @@ msgid "Office"
 msgstr "ቢሮ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr ""
 
@@ -2690,17 +2726,17 @@ msgid "Web Site"
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr "ስፋት"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr "እርዝማኔ"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr ""
 
@@ -2744,91 +2780,94 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "ተመርጠዋል"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "የፋይል ስም"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "መሥራት"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "መግለጫ የለም"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "የቤት ስልክ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "የግል"
+msgid "work"
+msgstr "መሥራት"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "የግል"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "አርእስት"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "የቤት ፋክስ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2836,150 +2875,150 @@ msgstr ""
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "አልተገኘም"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "በላዩ ላይ ይጻፍ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "ዝርዝር"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -3016,33 +3055,31 @@ msgstr ""
 msgid "Querying Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
-msgid "and %d other contacts."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
 msgid "and one other contact."
-msgstr ""
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr ""
 
@@ -3190,7 +3227,7 @@ msgstr "ህዳጎች"
 msgid "Number of columns:"
 msgstr "የዐምድ ብዛት"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "&ምርጫዎች"
 
@@ -3369,7 +3406,7 @@ msgid "Unnamed List"
 msgstr ""
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
@@ -3448,7 +3485,7 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: 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"
@@ -3494,24 +3531,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "ክፈት"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3520,12 +3557,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3533,7 +3570,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3544,7 +3581,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3709,13 +3746,13 @@ msgstr ""
 msgid "Location contains"
 msgstr "ቦታ፦"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "ቀን መቁጠሪያ"
 
@@ -3731,7 +3768,7 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "ቀን"
 
@@ -3742,7 +3779,7 @@ 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.
 #: 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"
 
@@ -3764,78 +3801,78 @@ 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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 #, fuzzy
 msgid "New meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 #, fuzzy
 msgid "M_eeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "ቀን መቁጠሪያ፦ (_A)"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3865,11 +3902,6 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "የተለመደው ዕይታ"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3887,16 +3919,16 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -3963,11 +3995,11 @@ msgstr ""
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ሰዓትን"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
@@ -3991,11 +4023,11 @@ msgstr "ቀላል"
 msgid "Date/Time:"
 msgstr "ቀን/ሰዓት፦"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ድምፅ አጫውት"
 
@@ -4004,17 +4036,17 @@ msgstr "ድምፅ አጫውት"
 msgid "Reminders"
 msgstr "ደቂቃዎች"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "ፕሮግራምን አስኪድ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "ማጠቃለያ፦"
@@ -4045,7 +4077,7 @@ msgid "hour(s)"
 msgstr "ሰዓት(ኦች)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "ደቂቃ(ዎች)"
 
@@ -4055,8 +4087,8 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr "ያስችላል"
 
@@ -4071,19 +4103,19 @@ msgstr "አስወግድ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "አበላሽ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr "አስቻለ"
 
@@ -4107,7 +4139,7 @@ msgstr "30 ደቂቃ"
 msgid "60 minutes"
 msgstr "60 ደቂቃ"
 
-#: 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 ""
 
@@ -4132,7 +4164,7 @@ msgid "Days"
 msgstr "ቀን"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "አስቻለ"
 
@@ -4228,7 +4260,7 @@ msgid "Wednesday"
 msgstr "ረቡዕ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr ""
 
@@ -4274,7 +4306,6 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "አጠቃላይ"
 
@@ -4365,7 +4396,7 @@ msgid ""
 msgstr ""
 
 #: 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 ""
 
@@ -4507,28 +4538,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr "ወደ"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr ""
 
@@ -4564,8 +4595,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
@@ -4579,35 +4611,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "ቀን መቁጠሪያ"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "አድራሻ"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4637,18 +4654,24 @@ msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
 #, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
 #, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4710,7 +4733,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
@@ -4783,8 +4806,6 @@ msgstr "ቀን መቁጠሪያ፦ (_A)"
 
 #: 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 ""
 
@@ -4839,13 +4860,13 @@ msgstr ""
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "ምንም"
 
@@ -4902,13 +4923,13 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
@@ -5090,7 +5111,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr "አስወግድ"
 
@@ -5129,7 +5150,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5138,6 +5159,28 @@ msgstr ""
 msgid "Save Event"
 msgstr "የቀን መቁጠሪያ ኩነቶች"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "ዶሴ ምረጡ"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr ""
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "ቀን መቁጠሪያ"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "አድራሻ"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
@@ -5167,39 +5210,39 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr "ከፍ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "የተለመደ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
@@ -5215,7 +5258,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "አጥፉ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5259,9 +5302,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "መግለጫ"
 
@@ -5271,12 +5314,14 @@ msgid "Folder:"
 msgstr "_ዶሴ፦"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr ""
+#, fuzzy
+msgid "Sta_rt date:"
+msgstr "ቀን፦"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr ""
+#, fuzzy
+msgid "_Due date:"
+msgstr "ቀን፦"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "Authentication Credentials for HTTP Server"
@@ -5332,137 +5377,113 @@ msgid "Weekly"
 msgstr "ሳመንት"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d ቀን"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 ቀን"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d ሳመንት"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 ሳመንት"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d ሰዓት"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 ሰዓት"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d ደቂቃዎች"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ቀን"
+msgstr[1] "%d ቀን"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 ደቂቃ"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d ሳመንት"
+msgstr[1] "%d ሳመንት"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d ሴኮንዶች"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ሰዓት"
+msgstr[1] "%d ሰዓት"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 ሴኮንድ"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ደቂቃዎች"
+msgstr[1] "%d ደቂቃዎች"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr ""
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ሴኮንዶች"
+msgstr[1] "%d ሴኮንዶች"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s በ %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 ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-cal-list-view.etspec.h:1
 #, fuzzy
-msgid "Description"
-msgstr "መግለጫ"
+msgid "End Date"
+msgstr "ቀን"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "ማጠቃለያ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "ቀለም"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr ""
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "ነፃ"
@@ -5495,141 +5516,39 @@ msgid ""
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "አዎ"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "አይ"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "አትም"
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "ለጥፍ"
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "ክፈት"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "በሌላ ስም አስቀምጥ"
-
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "ቁረጥ"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "ቅጂ"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "ምርጫዎች"
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "+0"
@@ -5674,32 +5593,85 @@ msgstr ""
 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 ""
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "ክፈት"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr ""
 
-#: 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 "በሌላ ስም አስቀምጥ"
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "አትም"
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "ቁረጥ"
+
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "ቅጂ"
+
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "ለጥፍ"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -5708,38 +5680,101 @@ msgstr ""
 msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
+msgstr "አውቶማቲክ"
+
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
+msgstr "ቀን፦"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Priority"
+msgstr "ቅድሚያ"
+
 #: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#, fuzzy
+msgid "Start date"
+msgstr "ቀን፦"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Priority"
-msgstr "ቅድሚያ"
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "ዶሴ ምረጡ"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "አጥፉ..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "ወደ ዶሴን ሂዱ..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "ወደ ዶሴን ሂዱ..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "ምርጫዎች"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5768,26 +5803,26 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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 "ጠዋት"
 
 #. 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 "ከሳዓት"
@@ -5796,415 +5831,411 @@ msgstr "ከሳዓት"
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "በየቀን"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "በየ%d ቀን"
+msgid_plural "Every %d days"
+msgstr[0] "በየቀን"
+msgstr[1] "በየቀን"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "በየሳመንት"
+msgid_plural "Every %d weeks"
+msgstr[0] "በየሳመንት"
+msgstr[1] "በየሳመንት"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, c-format
-msgid "Every %d weeks"
-msgstr "በየ%d ሳመንት"
-
-#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr ""
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " እና "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "በየወር"
+msgid_plural "every %d months"
+msgstr[0] "በየወር"
+msgstr[1] "በየወር"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "በየ%d ወር"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "በየ ዓመት"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "በየ%d ዓመታት"
+msgid_plural "Every %d years"
+msgstr[0] "በየ ዓመት"
+msgstr[1] "በየ ዓመት"
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>ምንም</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "ቦታ፦"
+
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "አሻሽል"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6339,7 +6370,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6425,12 +6456,12 @@ msgstr "ቅድሚያ"
 msgid "Web Page:"
 msgstr "ገጽ"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6438,7 +6469,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6446,59 +6477,61 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1751
+#: calendar/gui/gnome-cal.c:1760
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1779
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
-msgid "Loading appointments at %s"
+msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid "Opening %s"
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1940
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "አትም"
@@ -6520,45 +6553,46 @@ msgid "February"
 msgstr "ፌብሩወሪ"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "ጃንዩወሪ"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "ጁላይ"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "ጁን"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "ማርች"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "ሜይ"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "ኖቬምበር"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "ኦክተውበር"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "ሁሉንም ምረጡ"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "ሴፕቴምበር"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "ሂድ ወደ (_G)"
+msgid "_Select Today"
+msgstr "ዶሴ ምረጡ"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6640,7 +6674,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -6797,81 +6831,81 @@ msgid "Sa"
 msgstr "ቅ"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%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 ""
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "ሁኔታ፦ %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "ቅድሚያ፦ %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URL፦ %s"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "ምድቦች፦ %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
@@ -6880,40 +6914,40 @@ msgstr "የህትመት ቅንጅት"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 #, fuzzy
 msgid "_Task"
 msgstr "የማይፈለግ"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "አድራሻ"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "የፋይል ስም"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8550,7 +8584,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8558,7 +8592,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8566,7 +8600,7 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr ""
 
@@ -8583,7 +8617,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -8694,30 +8728,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr ""
 
-#: 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 ""
 
@@ -8746,7 +8784,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 ""
 
@@ -9102,7 +9141,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9290,7 +9329,7 @@ msgstr ""
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
@@ -9301,21 +9340,22 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "የማይፈለግ"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ጁን"
@@ -9523,17 +9563,17 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9565,40 +9605,39 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "የሰርቨር ስም"
+msgid "Address Book And Calendar"
+msgstr "አድራሻ"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "&ፈልግ"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 #, fuzzy
 msgid "Checklist"
 msgstr "ዝርዝር"
@@ -9606,12 +9645,12 @@ msgstr "ዝርዝር"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9667,12 +9706,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: 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 ""
 
-#: 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
@@ -9686,25 +9725,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9776,18 +9815,18 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9797,14 +9836,14 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -9812,49 +9851,49 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9862,34 +9901,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9920,20 +9960,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%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 "የፖስታ ሳጥን፦%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)"
@@ -9989,7 +10029,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"
@@ -10038,8 +10078,8 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
@@ -10072,7 +10112,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr ""
@@ -10081,7 +10121,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
@@ -10102,7 +10142,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -10111,28 +10151,28 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10178,7 +10218,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10206,36 +10246,36 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr ""
@@ -10281,7 +10321,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -10325,14 +10365,14 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr ""
@@ -10603,46 +10643,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "ያልታወቀ ስህተት፦ %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 ""
 
-#: 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 ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10689,7 +10729,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr ""
 
@@ -10769,7 +10809,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr ""
 
@@ -10821,12 +10861,12 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -10945,11 +10985,11 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
-msgid "STARTTLS request timed out: %s"
+msgid "STARTTLS command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
+msgid "STARTTLS command failed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
@@ -10981,153 +11021,150 @@ msgid "SMTP mail delivery via %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "Cannot send message: service not connected."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, c-format
-msgid "HELO request timed out: %s"
+msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 #, c-format
-msgid "AUTH request timed out: %s"
+msgid "AUTH command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
+msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
 #, c-format
-msgid "DATA request timed out: %s: mail not sent"
+msgid "DATA command failed: %s: mail not sent"
 msgstr ""
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
 #, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
+msgid "RSET command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
+msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, c-format
-msgid "QUIT request timed out: %s"
+msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -11150,19 +11187,19 @@ msgstr "የmime ዓይነት"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr ""
 
@@ -11173,45 +11210,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "ከ፦"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "ጉዳዩ፦"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "ወደ፦"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "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 ""
 
-#: 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."
@@ -11220,11 +11257,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr ""
 
@@ -11232,82 +11269,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11316,48 +11353,53 @@ msgid ""
 msgstr ""
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11365,13 +11407,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11485,21 +11527,21 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr ""
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -11582,13 +11624,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "i p,"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "h"
 
@@ -11597,124 +11639,106 @@ msgstr "h"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 ሴኮንድ"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 ሴኮንድ"
+msgstr[1] "1 ሴኮንድ"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, fuzzy, c-format
-msgid "%d seconds ago"
-msgstr "%d ሴኮንዶች"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
 msgid "1 minute ago"
-msgstr "1 ደቂቃ"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 ደቂቃ"
+msgstr[1] "1 ደቂቃ"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, fuzzy, c-format
-msgid "%d minutes ago"
-msgstr "%d ደቂቃዎች"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
 msgid "1 hour ago"
-msgstr "1 ሰዓት"
+msgid_plural "%d hours ago"
+msgstr[0] "1 ሰዓት"
+msgstr[1] "1 ሰዓት"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, fuzzy, c-format
-msgid "%d hours ago"
-msgstr "%d ሰዓት"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
 msgid "1 day ago"
-msgstr "1 ቀን"
+msgid_plural "%d days ago"
+msgstr[0] "1 ቀን"
+msgstr[1] "1 ቀን"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, fuzzy, c-format
-msgid "%d days ago"
-msgstr "%d ቀን"
-
-#: filter/filter-datespec.c:69
-#, fuzzy
 msgid "1 week ago"
-msgstr "1 ሳመንት"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 ሳመንት"
+msgstr[1] "1 ሳመንት"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, fuzzy, c-format
-msgid "%d weeks ago"
-msgstr "%d ሳመንት"
-
-#: filter/filter-datespec.c:70
-#, fuzzy
 msgid "1 month ago"
-msgstr "ወር"
-
-#: filter/filter-datespec.c:70
-#, fuzzy, c-format
-msgid "%d months ago"
-msgstr "በየ%d ወር"
+msgid_plural "%d months ago"
+msgstr[0] "ወር"
+msgstr[1] "ወር"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, c-format
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, fuzzy, c-format
-msgid "%d years ago"
-msgstr "በየ%d ዓመታት"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "አሁኑኑ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 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 ""
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
-msgstr ""
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "አጣራዎች"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr ""
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
 
@@ -11726,23 +11750,23 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "አስፈላጊ"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "ፈተና"
 
@@ -11750,48 +11774,56 @@ msgstr "ፈተና"
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
+msgstr "የፋይል ስም"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "ያልተሰየመ"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
+msgid "    "
 msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr ""
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:5
@@ -11799,80 +11831,68 @@ msgid "Incoming"
 msgstr ""
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "ወር"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "ሴኮንዶች"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr ""
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "ሳመንታት"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr ""
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "ዓመታት"
 
@@ -12006,7 +12026,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "ጁን"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "መለያ"
@@ -12038,8 +12058,9 @@ msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr ""
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "ከፕሮግራሙ ውጣ"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12073,23 +12094,24 @@ msgstr ""
 msgid "returns less than"
 msgstr ""
 
-#: 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 "ፕሮግራምን አስኪድ፦"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "ነጥብ"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "የሼሉን ትእዛዝ"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "መጠን kb"
@@ -12114,9 +12136,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "ጉዳዩ"
@@ -12125,17 +12147,13 @@ msgstr "ጉዳዩ"
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr ""
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
@@ -12147,9 +12165,10 @@ msgstr ""
 msgid "Rule name"
 msgstr ""
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
-msgstr ""
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
+msgstr "ሲሼልስ"
 
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
@@ -12183,15 +12202,20 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "ዶሴ (_F)"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr ""
 
@@ -12240,8 +12264,8 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "ፖስታ"
@@ -12250,53 +12274,49 @@ msgstr "ፖስታ"
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "የነበረው"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr ""
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "ጽሑፍ"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "ቋንቋ"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
+#: mail/em-composer-prefs.c:1000
+msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr ""
 
@@ -12341,7 +12361,7 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12375,405 +12395,435 @@ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "በመጫን ላይ..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "ዶሴን አስወግድ"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "ዶሴ"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "መልዕክቶች"
+
+#: mail/em-folder-tree.c:888
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr ""
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"ን አጥፉ"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "ተመልከት (_V)"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "መንቀሳቅስ"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "ምርጫዎች"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "አትም"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "ወደፊት፦"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "አታጥፋ"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "አጣራዎች"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "የነበረው"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 #, fuzzy
 msgid "Unsigned"
 msgstr "ያልተሰየመ"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "ደብቅ"
@@ -12783,125 +12833,160 @@ msgstr "ደብቅ"
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "ከ"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "ወደ"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "ቀን"
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "በየ ዓመት"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "በየሳመንት"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "በየወር"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12910,28 +12995,28 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
@@ -12972,102 +13057,102 @@ msgstr ""
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "ዶሴ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "አጣራዎች"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "መልዕክት"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "አድራሻ"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "መልዕክቶች"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13076,7 +13161,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13141,255 +13226,287 @@ msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Default reply style"
+msgid "Default height of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Default width of the Composer Window"
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Message Window"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
-msgid "Enable/disable caret mode"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:23
-msgid "Height of the message-list pane"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:24
-msgid "Height of the message-list pane."
+msgid "Enable/disable caret mode"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13397,110 +13514,110 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "ከውጭ አስገባ"
@@ -13540,14 +13657,14 @@ msgstr ""
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13594,12 +13711,12 @@ msgstr "ከውጭ አስገባ"
 msgid "Scanning %s"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:650
+#: mail/importers/netscape-importer.c:651
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13614,7 +13731,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13622,7 +13739,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13631,23 +13748,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "ምርጫዎች"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13676,59 +13793,28 @@ msgstr ""
 msgid "Pine"
 msgstr ""
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr ""
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "የተጠቃሚ ስም"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -13761,11 +13847,11 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13773,84 +13859,85 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 #, fuzzy
 msgid "New Mail Message"
 msgstr "%s - መልዕክት"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 #, fuzzy
 msgid "_Mail Message"
 msgstr "መልዕክቶች"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "ዶሴ (_F)"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "ሴኔጋል"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13859,623 +13946,645 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
 msgstr ""
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "ቅድመ ዕይታ"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
+msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
+msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:20
-msgid "Attach original message"
+msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:22
-msgid "Authentication"
+msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
-msgstr "ባልቲክ (ISO-8859-13)"
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
-msgstr "ባልቲክ iso 8859"
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "ቀለሞች (_O)"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "Check _Incoming Mail"
-msgstr "ሴኔጋል"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:28
-msgid "Check spelling while I _type"
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:30
-msgid "Checks incoming mail messages to be Junk"
+msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:31
-msgid "Color for _misspelled words:"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:32
-msgid "Composing Messages"
+msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "ምርጫዎች"
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:34
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
+msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "De_fault"
-msgstr "የነበረው (_F)"
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "ጽሑፍ"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
 
 #: mail/mail-config.glade.h:42
-msgid "Default Behavior"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 #: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+msgid "Attachment"
 msgstr ""
 
 #: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
+msgid "Automatically _insert smiley images"
 msgstr ""
 
 #: mail/mail-config.glade.h:47
-msgid "Do not quote original message"
+msgid "Automatically check for _new mail every"
 msgstr ""
 
 #: mail/mail-config.glade.h:48
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
+msgid "Baltic (ISO-8859-13)"
+msgstr "ባልቲክ (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Done"
-msgstr "ጨርሷል"
+#: mail/mail-config.glade.h:49
+msgid "Baltic (ISO-8859-4)"
+msgstr "ባልቲክ iso 8859"
 
 #: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "C_haracter set:"
 msgstr ""
 
 #: mail/mail-config.glade.h:52
-msgid "Email Accounts"
+msgid "Ch_eck for Supported Types "
 msgstr ""
 
 #: mail/mail-config.glade.h:53
-msgid "Email _address:"
-msgstr "ኢሜያል አድራሻ"
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "ሴኔጋል"
 
 #: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+msgid "Check spelling while I _type"
 msgstr ""
 
 #: mail/mail-config.glade.h:55
-msgid "Encry_ption certificate:"
+msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Evolution Account Assistant"
+msgid "Color for _misspelled words:"
 msgstr ""
 
 #: mail/mail-config.glade.h:57
-msgid "Execute Command..."
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "ቀለሞች (_O)"
 
 #: mail/mail-config.glade.h:58
-msgid "Fi_xed -width:"
+msgid "Confirm _when expunging a folder"
 msgstr ""
 
 #: mail/mail-config.glade.h:59
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+msgid "De_fault"
+msgstr "የነበረው (_F)"
+
+#: mail/mail-config.glade.h:67
+msgid "Default character e_ncoding:"
+msgstr ""
+
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Filter Options"
-msgstr "አጣራዎች"
+msgid "Defaults"
+msgstr "ነባሮች"
+
+#: mail/mail-config.glade.h:70
+msgid "Do not quote original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
+msgstr "ጨርሷል"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "_ዶሴ፦"
+
+#: mail/mail-config.glade.h:75
+msgid "Email Accounts"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
+msgstr "ኢሜያል አድራሻ"
+
+#: mail/mail-config.glade.h:77
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
+msgstr ""
+
+#: mail/mail-config.glade.h:79
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "Execute Command..."
+msgstr ""
+
+#: mail/mail-config.glade.h:81
+msgid "Fi_xed -width:"
+msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "ፖስታ"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "የገጽ አናት"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr ""
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr ""
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr ""
-
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "መልዕክቶች"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr ""
-
-#: 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"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "ቀለም ምረጡ"
 
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
+#: mail/mail-config.glade.h:109
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
+#: mail/mail-config.glade.h:120
+msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
 msgstr "_ደህነት"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr ""
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-msgid "Sending Email"
-msgstr ""
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "አጥፉ..."
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:127
+msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr ""
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
+msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "ሲንጋፖር"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "ሲንጋፖር"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+msgid "T_erminal Font:"
+msgstr ""
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "ዓይነት፦"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
 "dictionary installed."
 msgstr ""
 
-#: 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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr ""
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr ""
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
+#: mail/mail-config.glade.h:157
+msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
+#: mail/mail-config.glade.h:158
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "ነባሮች"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "አስቻለ"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "ሙሉ ስም"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "ጁን"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "ስም"
 
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:171
+msgid "_Never load images from the Internet"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "ጽሑፍ"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "አጥፉ..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:174
-msgid "_Show animated images"
-msgstr ""
-
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr ""
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr ""
-
 #: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
+msgid "_Show animated images"
 msgstr ""
 
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "ደቂቃ(ዎች)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "ቀለም"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "መግለጫ"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -14483,175 +14592,170 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:741
+#: mail/mail-ops.c:695
 #, c-format
-msgid "Failed on message %d of %d"
+msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr ""
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
+msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr ""
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
+msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -14664,110 +14768,105 @@ msgstr ""
 msgid "Find:"
 msgstr "ፈልግ"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "&ፈልግ"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
+msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "መግለጫ"
-
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "መረጃ"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "ዓይነት፦ %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Cancel _All"
 msgstr "ተወው"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "ስም"
 
@@ -14797,17 +14896,17 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14816,84 +14915,84 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "ዝቅተኛ"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "ዛሬ %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "ትናንት %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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr ""
 
@@ -14941,7 +15040,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ወደፊት"
 
@@ -14949,11 +15048,11 @@ msgstr "ወደፊት"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr ""
 
@@ -14976,7 +15075,7 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr ""
 
 #: mail/message-tags.glade.h:7
@@ -15179,7 +15278,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -15202,83 +15301,83 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "ከውጭ አስገባ"
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "የፋይል ስም፦"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "ፋይል ምረጡ"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "የፋይሉ ዓይነት፦"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "ከ %s፦"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "ከውጭ አስገባ"
@@ -15287,7 +15386,7 @@ msgstr "ከውጭ አስገባ"
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15321,11 +15420,11 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15334,10 +15433,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr ""
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -15379,15 +15474,15 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr ""
 
@@ -15435,7 +15530,6 @@ msgstr ""
 
 #: 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 "አዲስ"
 
@@ -15484,15 +15578,16 @@ msgid "Create a new test item"
 msgstr "አዲስ ዶሴ ፍጠር"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr ""
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+msgid "Active Connections"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -15605,28 +15700,28 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "ከውጭ አስገባ"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15646,99 +15741,110 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "ይሻሻል"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "ሚስጢራዊ ቃል አስገቡ"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "ሚስጢራዊ ቃል አስገቡ"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -15926,7 +16032,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr ""
 
@@ -16207,7 +16314,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "ክሊፕቦርዱን ለጥፍ"
 
@@ -16216,8 +16323,8 @@ msgid "Previews the contacts to be printed"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "የቅድመ ህትመት ዕይታ"
 
@@ -16265,13 +16372,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
 
@@ -16292,14 +16399,10 @@ msgid "_Save as VCard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "ሁሉንም ምረጡ (_S)"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -16307,58 +16410,54 @@ msgstr ""
 msgid "Day"
 msgstr "ቀን ኦች"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "ሂድ ወደ"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "ሂድ ወደ ኋላ"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "ሂድ ውደ ፊት"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "ዝርዝር"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "ወር"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "የሚቀጥለው"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "የቀድሞው"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr ""
@@ -16367,7 +16466,7 @@ msgstr ""
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "ገጽ"
@@ -16377,35 +16476,55 @@ msgid "Purge old appointments and meetings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "ሁሉንም ምረጡ"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "ፋይል ምረጡ"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "ዶሴ ምረጡ"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "ዛሬ"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "የአሁኑን ፋይል አስቀምጥ"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "ሳመንት"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr ""
 
@@ -16676,7 +16795,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -16844,307 +16963,308 @@ msgid "F_orward As..."
 msgstr "ወደፊት (_O)"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "አጣራዎች"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "መንቀሳቅስ"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "የሚቀጥለው"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "አልተገኘም"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "የመጀመሪያው መጠን (_Z)"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "የቀድሞው"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "አነስተኛ (_M)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "ሂድ ወደ (_G)"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "መሣሪያዎች (_T)"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "አታጥፋ (_U)"
 
@@ -17411,39 +17531,39 @@ msgstr ""
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "የማይፈለግ"
@@ -17576,10 +17696,15 @@ msgid "_Day View"
 msgstr "የቀን ዕይታ (_D)"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "የተለመደው ዕይታ"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "የወር ዕይታ (_M)"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr ""
 
@@ -17612,10 +17737,16 @@ msgid "_Messages"
 msgstr "መልዕክቶች"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "በምድብ ጋር (_C)"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "ቀን፦"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "ሁኔታ"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr ""
 
@@ -17673,14 +17804,10 @@ msgstr "ሳማረሐዓቅእ"
 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 "አሁኑኑ"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "ዛሬ"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -17690,82 +17817,87 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "ባቲክ"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "ካከለኛ አውሮፓውያን"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "ቻይንኛ"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "ቄርሎሳዊ ጽሑፍ"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "ግሪክኛ"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "ዕብራስጥ"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "ጃፓንኛ"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "ኮሪያኛ"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "ቱርክኛ"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "ዩኒኮድ"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "ምዕራብ አውሮፓዊ"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "ምዕራብ አውሮፓዊ"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "ባሕላዊው"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "ቀላል"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "ዩክረኒኛ"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "ሌላ..."
 
@@ -17829,11 +17961,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "ፈልግ"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr ""
 
@@ -17853,15 +17990,15 @@ msgstr "ጠለቅ... (_A)"
 msgid "Choose Image"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "ፈልግ"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "ሰርዝ"
 
@@ -17892,6 +18029,134 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "አድራሻ"
+
+#~ msgid "Selected:"
+#~ msgstr "ተመርጠዋል፦"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "ወር"
+
+#~ msgid "1 day"
+#~ msgstr "1 ቀን"
+
+#~ msgid "1 week"
+#~ msgstr "1 ሳመንት"
+
+#~ msgid "1 hour"
+#~ msgstr "1 ሰዓት"
+
+#~ msgid "1 minute"
+#~ msgstr "1 ደቂቃ"
+
+#~ msgid "1 second"
+#~ msgstr "1 ሴኮንድ"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "መግለጫ"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "በየ%d ቀን"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "በየ%d ሳመንት"
+
+#~ msgid "every %d months"
+#~ msgstr "በየ%d ወር"
+
+#~ msgid "Every %d years"
+#~ msgstr "በየ%d ዓመታት"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "ሂድ ወደ (_G)"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "የሰርቨር ስም"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "&ፈልግ"
+
+#, fuzzy
+#~ msgid "%d seconds ago"
+#~ msgstr "%d ሴኮንዶች"
+
+#, fuzzy
+#~ msgid "%d minutes ago"
+#~ msgstr "%d ደቂቃዎች"
+
+#, fuzzy
+#~ msgid "%d hours ago"
+#~ msgstr "%d ሰዓት"
+
+#, fuzzy
+#~ msgid "%d days ago"
+#~ msgstr "%d ቀን"
+
+#, fuzzy
+#~ msgid "%d weeks ago"
+#~ msgstr "%d ሳመንት"
+
+#, fuzzy
+#~ msgid "%d months ago"
+#~ msgstr "በየ%d ወር"
+
+#, fuzzy
+#~ msgid "%d years ago"
+#~ msgstr "በየ%d ዓመታት"
+
+#~ msgid "Shell Command"
+#~ msgstr "የሼሉን ትእዛዝ"
+
+#~ msgid "[script]"
+#~ msgstr "ጽሑፍ"
+
+#~ msgid "Configuration"
+#~ msgstr "ምርጫዎች"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "አጣራዎች"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "መልዕክቶች"
+
+#~ msgid "Re_member this password"
+#~ msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
+
+#~ msgid "Remember this _password"
+#~ msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
+
+#~ msgid "S_ecurity"
+#~ msgstr "_ደህነት"
+
+#~ msgid "_Full name:"
+#~ msgstr "ሙሉ ስም"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "ጁን"
+
+#~ msgid "Search"
+#~ msgstr "&ፈልግ"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "መግለጫ"
+
+#~ msgid "With _Category"
+#~ msgstr "በምድብ ጋር (_C)"
+
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
@@ -17908,14 +18173,6 @@ msgstr ""
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Copy Folder"
-#~ msgstr "ዶሴ"
-
-#, fuzzy
-#~ msgid "Move Folder"
-#~ msgstr "ዶሴን አስወግድ"
-
-#, fuzzy
 #~ msgid "Create New Shortcut Group"
 #~ msgstr "አዲስ ዶሴ ፍጠር"
 
@@ -17968,9 +18225,6 @@ msgstr ""
 #~ msgid "Session not initialised"
 #~ msgstr "bonobo ማስጀመር አልቻልኩም!"
 
-#~ msgid "Go to folder..."
-#~ msgstr "ወደ ዶሴን ሂዱ..."
-
 #, fuzzy
 #~ msgid "Could not create a directory for the new addressbook."
 #~ msgstr "አዲስ ዶሴ ፍጠር"
@@ -17987,9 +18241,6 @@ msgstr ""
 #~ msgid "Rename"
 #~ msgstr "እንደገና ሰይም"
 
-#~ msgid "_Folder:"
-#~ msgstr "_ዶሴ፦"
-
 #~ msgid "East Timor"
 #~ msgstr "ምስራቅ ቲሞር"
 
@@ -18001,18 +18252,10 @@ msgstr ""
 #~ msgstr "<b>ሁኔታ፦</b>"
 
 #, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>ሁኔታ፦</b>"
-
-#, fuzzy
 #~ msgid "<b>Task List</b>"
 #~ msgstr "<b>ሁኔታ፦</b>"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>ሁኔታ፦</b>"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>ሁኔታ፦</b>"
 
@@ -18043,10 +18286,6 @@ msgstr ""
 #~ "%s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "ቅድመ ዕይታ"
-
-#, fuzzy
 #~ msgid "<b>Web Page</b>"
 #~ msgstr "ገጽ"
 
@@ -18251,10 +18490,6 @@ msgstr ""
 #~ msgstr "ዝናብ"
 
 #, fuzzy
-#~ msgid "Schedule"
-#~ msgstr "ሲሼልስ"
-
-#, fuzzy
 #~ msgid "_Delete Feed"
 #~ msgstr "የጠፋ"
 
diff --git a/po/az.po b/po/az.po
index a147c9f1b7..31c0e19d85 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-01-29 19:19+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -17,6 +17,47 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.2\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 Ünvan Kitabçası"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Yerli ünvan kitabçası qovluqlarını göstər"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Fərqli Qeyd Et"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kartlar"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "kartlar"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Əlaqələr: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Alarm"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Ön Qurğulu Sync Ünvanı:"
@@ -94,76 +135,92 @@ msgstr "S/Mime vəsiqələrinizi buradan idarə edin"
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' ünvan kitabçası silinəcəkdir. Davam etmək istəyirsiniz?"
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Yeni Ünvan Kitabçası"
 
-#: 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 "Sil"
 
-#: 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 "Xassələr..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "Ə_laqə"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Yeni əlaqə yarat"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "Əlaqə _Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Yeni əlaqə siyahısı yarat"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Yeni Ünvan Kitabçası"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Ünvan Dəftəri"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Yeni vəzifə yarat"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP vericisinə bağlanma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "IMAP vericisinə tanıdılma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Kök DSE üstündə sorğu həyata keçirilə bilmədi"
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "Bu verici dəstəklənməyən axtarış bazaları ilə cavab verdi"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Sxem mə'lumatını alma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Verici hökmlü sxem mə'lumatı ilə cavab vermədi"
 
@@ -192,17 +249,17 @@ msgstr "`%s' daşınır:"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Bu Kompüterdə"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Şəxsi"
 
@@ -247,7 +304,7 @@ msgstr "Bu ünvan kitabçasının mühərriki bu sorğunu tətbiq etməyi rədd
 msgid "This query did not complete successfully."
 msgstr "Bu sorğu müvəffəqiyyətlə nəticələnmədi."
 
-#: 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."
@@ -255,7 +312,7 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi. Xahiş edirik, cığırın mövcud olduğunu və "
 "üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: 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."
@@ -263,7 +320,7 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi. Ya səhv URI bildirdiniz, ya da LDAP "
 "vericisinə yetişilə bilmir."
 
-#: 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 "
@@ -273,7 +330,7 @@ msgstr ""
 "LDAP dəstəkli Evolution üçün aşağıdakı körpüdən OpenLDAP-ı aldıqdan sonra "
 "CVS mənbələrini yenidən dərləməlisiniz."
 
-#: 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."
@@ -281,28 +338,28 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi.  Ya səhv URL bildirdiniz, ya da vericiyə "
 "yetişilə bilmir."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Ünvan kitabçası açıla bilmədi"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP vericisinə anonim olaraq yetişmə"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Tanıdılma bacarılmadı.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s üçün şifrə daxil edin (istifadəçi %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 ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "Təqvimin göstərəcəyi URI"
@@ -328,16 +385,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "Adları seç dialoqunda ən son işlədilən qovluğun URI-si"
 
 #: 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 "  Dəstəklənən Bazaları _Göstər "
 
-#: 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
@@ -352,62 +403,53 @@ msgstr "  Dəstəklənən Bazaları _Göstər "
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Ünvan Kitabçası Yaratma Bələdçisi"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Ünvan Kitabçası Xassələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Ü_nvan Kitabçası Mənbələri..."
-
-#: 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 "Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonim olaraq"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -420,51 +462,51 @@ msgstr ""
 "Burada bildirdiyiniz mə'lumatları qeyd etməkk üçün xahiş edirik \"Qurtar\" "
 "düyməsinə basın."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Bağlanır"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Ayırılan _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Epoçt ünvanı:"
 
-#: 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 sizi vericiyə tanıtmaq üçün DN istifadə edəcək"
 
-#: 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 sizi vericiyə tanıtmaq üçün bu epoçt ünvanını istifadə edəcək"
 
-#: 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 "Qurtardı"
 
-#: 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 "Ümumi"
 
-#: 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 "Qrup:"
 
-#: 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 "Qətiyyən"
 
-#: 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"
@@ -474,30 +516,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Bir"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Axtarışın əhatə _sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Seçilən:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -508,7 +546,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -517,7 +555,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -525,7 +563,7 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -533,32 +571,32 @@ msgid ""
 "\t\t\t  up an address book."
 msgstr "Təqvim qurğusundakı ilk addım göstəriləcək ad və qrupun seçilməsidir."
 
-#: 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 "Addım 1: Qovluq Xassələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Addım 2: Verici Mə'lumatı"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Addım 3: Vericiyə Bağlanma"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Addım 4: Qovluqların Actarılması"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Alt"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Dəstəklənən Axtarış Bazaları"
 
-#: 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"
@@ -567,7 +605,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -575,7 +613,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -585,7 +623,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -595,41 +633,41 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Bu sizin ldap vericinizin tam adıdır. Məsələn: \"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"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -637,28 +675,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr "BU seçim axtarışın nə vaxtla icra ediləcəyini bildirir."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS _işlət:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Ayırılan ad (DN) işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Epoçt ünvanı işlədilir"
 
-#: 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 "Mümkünsə Həmişə"
 
-#: 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"
@@ -666,60 +704,48 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Göstərilən ad:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: 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 "_Düzəlt"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Giriş yöntəmi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Qapı nömrəsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Vaxt Dolması (dəqiqə):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "bağlanma-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "ümumi-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "axtarış-səkməsi"
 
@@ -751,7 +777,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML Məktubu Göndərilsin?"
 
 #: 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 "Əlaqələrə Əlavə Et"
 
@@ -767,7 +793,7 @@ msgstr "Ad"
 
 #: 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 "Mənbə"
 
@@ -834,7 +860,8 @@ msgstr "İş birliyi"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Əlaqə Editoru"
 
@@ -843,7 +870,7 @@ msgid "D_epartment:"
 msgstr "_Bölmə:"
 
 #: 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 "Təfərruatlar"
@@ -926,16 +953,27 @@ msgstr "_Kateqoriyalar..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Sil"
 
+#: 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 "_Düzəlt"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Ev:"
@@ -977,22 +1015,22 @@ msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Ünvan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Dəyişdirilə bilən"
 
@@ -1973,9 +2011,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -1989,20 +2027,21 @@ msgid "MSN Messenger"
 msgstr "_Məktub İsmarışı"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Xidmət"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Mövqe"
 
@@ -2011,112 +2050,96 @@ msgid "Username"
 msgstr "İstifadəçi adı"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Ev"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "İş"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Başqa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Mənbə Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Hədəf Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Əlaqə"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Yeni Əlaqə Mi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Yazıla Bilən Sahələr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Dəyişdirilib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Hesab Adı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Kateqoriya editoru mövcud deyildir."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Əlaqəni VCard Olaraq Qeyd Et"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Bu əlaqələri həqiqətən\n"
-"də silmək istəyirsiniz?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Bu əlaqəni həqiqətən\n"
-"də silmək istəyirsiniz?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "İş"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Qrup"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
@@ -2130,6 +2153,7 @@ msgid "_Edit Full"
 msgstr "_Hamısını Düzəlt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Tam Ad:"
 
@@ -2137,6 +2161,22 @@ msgstr "_Tam Ad:"
 msgid "E-_mail:"
 msgstr "E-_poçt:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Bu əlaqələri həqiqətən\n"
+"də silmək istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Bu əlaqəni həqiqətən\n"
+"də silmək istəyirsiniz?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Ünvan _2:"
@@ -2239,22 +2279,28 @@ msgid "_Title:"
 msgstr "B_aşlıq:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "Hesab adı:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr "IM Hesabı Əlavə Et"
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "Hesab adı:"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+#, fuzzy
+msgid "_IM Service:"
 msgstr "IM Xidməti:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Mövqe:"
 
+#: 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 "Üzvlər"
@@ -2275,25 +2321,26 @@ msgstr "Epoçt ünvanını _yazın ya da əlaqəni aşağıdakı siyahıya daş�
 msgid "contact-list-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
-#: 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 "Kitab"
 
-#: 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 "Yeni Siyahı Mı"
 
 #. 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 "Əlaqə Siyahısı Editoru"
 
-#: 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 "Siyahını VCard Olaraq Qeyd Et"
 
@@ -2345,23 +2392,21 @@ msgid "No contacts"
 msgstr "Əlaqə olmasın"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 əlaqə"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d əlaqə"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d əlaqə"
+msgstr[1] "%d əlaqə"
 
-#: 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 "Sorğu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Kitab görünüşü alınırkən xəta yarandı"
 
@@ -2373,133 +2418,132 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Ad bununla başlayır:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Epoçt bununla başlayır:"
 
-#: 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 "Kateqoriya budur:"
 
 #. 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 "Hər hansı bir sahə bunu daxil edir:"
 
-#: 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 "Ətraflı..."
 
-#: 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 "Növ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Ünvan Dəftəri"
 
-#: 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 "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Yeni Əlaqə..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Əlaqələri Axtar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Ü_nvan Kitabçası Mənbələri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilot Qurğuları..."
 
-#: 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 "Əlaqəni Ötür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Ünvan kitabçası..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Ünvan kitabçası..."
 
-#: 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 "Kəs"
 
-#. 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 "Köçür"
 
-#: 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 "Yapışdır"
 
-#: 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 "Hazırkı Görünüş"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2508,7 +2552,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
@@ -2542,8 +2586,6 @@ msgid "Car Phone"
 msgstr "Maşın Telefonu"
 
 #: 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 "Kateqoriyalar"
 
@@ -2552,7 +2594,7 @@ msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Epoçt"
 
@@ -2603,6 +2645,7 @@ msgid "Manager"
 msgstr "İdarəçi"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Əl Telefonu"
 
@@ -2611,7 +2654,7 @@ msgid "Nickname"
 msgstr "Ləqəb"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Qeyd"
 
@@ -2620,7 +2663,7 @@ msgid "Office"
 msgstr "İdarə"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Quruluş"
 
@@ -2676,17 +2719,17 @@ msgid "Web Site"
 msgstr "Veb Saytı"
 
 #: 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 "En"
 
 #: 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 "Hündürlük"
 
 #: 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 "Fokusa Malikdir"
 
@@ -2738,89 +2781,92 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Seçili"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Kursora Malikdir"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Üzvləri Sırala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "Epoçt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "İş"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "İzahat"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Qrup"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Video Görüşmə URL-si:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Şəxsi"
+msgid "work"
+msgstr "İş"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Bloq"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Şəxsi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Məslək"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Ev səhifəsi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
-#: 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
@@ -2828,93 +2874,93 @@ msgstr "Müvəffəqiyyət"
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Nüsxə xətdə deyil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Qadağandır"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Əlavə tapıla bilmədi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Əlaqə ID-si onsuz da mövcuddur"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
-#: 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 "Ləğv Edildi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Tanıtma Bacarılmadı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Tanıtma Məcburidir"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS Mövcud Deyil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Ünvan kitabçası mövcud deyil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Unut"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: 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 "Əlaqə əlavə etmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Əlavə təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: 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 "Əlaqə silmə xətası"
 
-#: 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"
@@ -2923,7 +2969,7 @@ msgstr ""
 "%d kart açmaq %d yeni pəncərə də açacaqdır.\n"
 "Həqiqətən də bütün bu kartları görmək istəyirsiniz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2932,50 +2978,50 @@ msgstr ""
 "%s onsuz da mövcuddur.\n"
 "Üstünə yazmaq istəyirsiniz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Üstünə yaz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "%s qeyd edilirkən xəta yarandı: %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 "siyahı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Əlaqəni daşı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Əlaqəni köçür"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Əlaqələri daşı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Əlaqələri köçür"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Əlaqələri Ünvan Kitabçasından Seç"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Çoxlu VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s üçün VCard"
@@ -3012,33 +3058,31 @@ msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
 msgid "Querying Address Book..."
 msgstr "Ünvan Kitabçası Sorğulanır..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Əlaqə Mə'lumatını Dəyişdir"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "E-Poçt Ünvanını Birləşdir"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "və %d başqa əlaqə."
-
-#: 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 "və bir başqa əlaqə."
+msgid_plural "and %d other contacts."
+msgstr[0] "və bir başqa əlaqə."
+msgstr[1] "və bir başqa əlaqə."
 
-#: 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 "Tam VCard-ı Göstər"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Kompakt VCard-ı Göstər"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Ünvan dəftərinə qeyd et"
 
@@ -3189,7 +3233,7 @@ msgstr "Kənarlar"
 msgid "Number of columns:"
 msgstr "Sütun ədədi:"
 
-#: 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 "Seçimlər"
 
@@ -3366,7 +3410,7 @@ msgid "Unnamed List"
 msgstr "Adsız Siyahı"
 
 #: 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 "Şifrəni bildir"
 
@@ -3443,7 +3487,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution Vəzifələr tərkib hissəsi"
 
 #: 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"
@@ -3489,26 +3533,26 @@ msgstr "Mürgüləmə vaxtı (dəqiqə)"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: 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 "Aç"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 #, fuzzy
 msgid "Dismiss"
 msgstr "_Nəzərə Ama"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 #, fuzzy
 msgid "Dismiss All"
 msgstr "_Heç Birini Nəzərə Alma"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3521,12 +3565,12 @@ msgstr ""
 "Başlama %s\n"
 "Bitiş %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 "Xəbərdarlıq"
 
-#: 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"
@@ -3538,7 +3582,7 @@ msgstr ""
 "üçün qurulubdur.  Evolution bunun yerinə normal\n"
 "xatırlatma ekranını göstərəcəkdir."
 
-#: 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 "
@@ -3555,7 +3599,7 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: 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 "Mənə bu proqram ilə əlaqəli bir də soruşma."
 
@@ -3720,13 +3764,13 @@ msgstr "Şərh bunu daxil edir:"
 msgid "Location contains"
 msgstr "İzahat bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
-#: 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 "Təqvim"
 
@@ -3744,7 +3788,7 @@ msgid "Purge events older than"
 msgstr "Bundan köhnə hadisələri sil"
 
 #: 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 "gün"
 
@@ -3755,7 +3799,7 @@ 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.
 #: 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 %b %d"
 
@@ -3777,70 +3821,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 "'%s' təqvimi silinəcəkdir. Davam etmək istəyirsiniz?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Yeni Təqvim"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Yeni görüş yarat"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Yeni görüş istəyi yarat"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Yeni tam günlük görüş"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "_Tam Günlük Görüş"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Yeni tam günlük görüş yarat"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Yeni təqvim"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_Təqvim"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Yeni təqvim yarat"
 
-#: 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 "Hadisə və görüşmələr yatamaq üçün '%s' təqvimi açıla bilmir"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Hadisə və görüşmələr yatamaq üçün təqvim mövud deyil"
 
@@ -3870,10 +3914,6 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Siyahı Görünüşü"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Təqvim açılırkən xəta oldu"
@@ -3891,16 +3931,16 @@ msgstr "Təqvimi açmaq üçün səlahiyyət verilmədi"
 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 "'%s' içindəki qovluq açıla bilədi"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Göstəriləcək nümayiş növü"
 
@@ -3964,11 +4004,11 @@ msgstr "dialoq1"
 msgid "extra times every"
 msgstr "hər əlavə vaxtda"
 
-#: 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 "saat"
 
-#: 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 "dəqiqə"
 
@@ -3991,11 +4031,11 @@ msgstr "Əsaslar"
 msgid "Date/Time:"
 msgstr "Tarix/Vaxt:"
 
-#: 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 "İsmarış göstər"
 
-#: 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 "Səs çal"
 
@@ -4003,17 +4043,17 @@ msgstr "Səs çal"
 msgid "Reminders"
 msgstr "Xatırladıcılar"
 
-#: 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 "Proqram işə sal"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr "Epoçt Göndər"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Epoçt göndər"
 
 #: 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 "Mündəricat:"
@@ -4044,7 +4084,7 @@ msgid "hour(s)"
 msgstr "saat"
 
 #: 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 "dəqiqə"
 
@@ -4054,8 +4094,8 @@ msgstr "iclasın başlanğıcı"
 
 #. 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 "Fəal"
 
@@ -4069,19 +4109,19 @@ msgstr "Silmə"
 
 #: 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 "Qeyri-fəallaşdır"
 
 #: 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 "Fəallaşdır"
 
@@ -4105,7 +4145,7 @@ msgstr "30 dəqiqə"
 msgid "60 minutes"
 msgstr "60 dəqiqə"
 
-#: 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 "Bildirişlər"
 
@@ -4130,7 +4170,7 @@ msgid "Days"
 msgstr "Gün"
 
 #: 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 "_Fəallaşdır"
 
@@ -4225,7 +4265,7 @@ msgid "Wednesday"
 msgstr "Çərşənbə"
 
 #: 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 "İş Həftəsi"
 
@@ -4270,7 +4310,6 @@ msgid "_Fri"
 msgstr "_Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Ümumi"
 
@@ -4367,7 +4406,7 @@ msgstr ""
 "düyməsinə basın."
 
 #: 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 "Yeni Vəzifə Siyahısı"
 
@@ -4512,28 +4551,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız, editor yenilənsin?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Yoxlama xətası: %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 " alıcı "
 
-#: 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 " (Qurtarılıb "
 
-#: 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 "Qurtarılıb "
 
-#: 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 " (Qalan "
 
-#: 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 "Qalan"
 
@@ -4569,8 +4608,9 @@ msgstr "Jurnal girişi - %s"
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: 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 "Fərqli qeyd et..."
 
@@ -4584,33 +4624,18 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Hazırkı buraxılış işlədilə bilmir!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Mənbə açıla bilmədi"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "Hədəf açıla bilmədi"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "Hədəf sırf oxunandır"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Hədəf mənbəni seç"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Təqvim"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Yeni vəzifə siyahısı"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4639,19 +4664,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu adsız jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "%d görüşü həqiqətən də silmək istəyirsiniz?"
+#, 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] "%d görüşü həqiqətən də silmək istəyirsiniz?"
+msgstr[1] "%d görüşü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
+#: 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] "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
+msgstr[1] "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
+#: 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] "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
+msgstr[1] "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4713,7 +4744,7 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: 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 "Görüş"
 
@@ -4786,8 +4817,6 @@ msgstr "Təqvim:"
 
 #: 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 "Sinifləndirmə"
 
@@ -4838,13 +4867,13 @@ msgstr "_Başlama vaxt:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Yoxdur"
 
@@ -4901,13 +4930,13 @@ msgid "Member"
 msgstr "Üzv"
 
 #: 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
@@ -5084,7 +5113,7 @@ msgid "_No recurrence"
 msgstr "Təkrarlama _yoxudr"
 
 #: 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 "Çı_xart"
 
@@ -5126,7 +5155,7 @@ msgstr ""
 "\n"
 "Dəyişiklikləriniz qeyd edilsin?"
 
-#: 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 "Dəyişiklikləri _Unut"
 
@@ -5134,6 +5163,28 @@ msgstr "Dəyişiklikləri _Unut"
 msgid "Save Event"
 msgstr "Hadisəni Qeyd Et"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "İdxalçı seçin"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Hədəf mənbəni seç"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Təqvim"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Yeni vəzifə siyahısı"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Görüş mə'lumatı yaradıldı. Göndərilsin?"
@@ -5163,39 +5214,39 @@ msgstr "% _Bitdi"
 #: 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 "Bitirilib"
 
 #: 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 "Yüksək"
 
 #: 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 "Fəaliyyətdə"
 
 #: 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 "Alçaq"
 
 #: 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 "Başlamayıb"
 
@@ -5209,7 +5260,8 @@ msgid "Undefined"
 msgstr "Təsvirsiz"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "_Bitirmə Tarixi:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5252,9 +5304,9 @@ msgstr "Ünvan kitabçası açıla bilmədi"
 msgid "Con_fidential"
 msgstr "Gi_zli"
 
-#: 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 "İzahat:"
 
@@ -5263,11 +5315,13 @@ msgid "Folder:"
 msgstr "Qovluq:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Başla_ma Tarixi:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Bitiş Tarixi:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5319,136 +5373,113 @@ msgid "Weekly"
 msgstr "Hər Həftə"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d gün"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 gün"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d həftə"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 həftə"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d saat"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 saat"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d dəqiqə"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d gün"
+msgstr[1] "%d gün"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 dəqiqə"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d həftə"
+msgstr[1] "%d həftə"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d saniyə"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d saat"
+msgstr[1] "%d saat"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 saniyə"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d dəqiqə"
+msgstr[1] "%d dəqiqə"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Epoçt göndər"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d saniyə"
+msgstr[1] "%d saniyə"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Namə'lum gedişat aparıldı"
 
-#: 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 "Görüşün başlamasından %s %s əvvəl"
 
-#: 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 "Görüşün başlamasından %s %s sonra"
 
-#: 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 "Görüşün başında %s"
 
-#: 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 "Görüşün qurtarmasından %s %s əvvəl"
 
-#: 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 "Görüşün bitişindən %s %s sonra"
 
-#: 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 "Görüşün bitişindən %s sonra"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s %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 "Namə'lum işə salma növü üçün %s"
 
-#: 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 "İctimai"
 
-#: 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 "Şəxsi"
 
-#: 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 "Gizli"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "İzahat"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Tarix"
 
-#: 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 "Başlama Tarixi"
 
-#: 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 "Mündəricat"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "rəng"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "tərkib hissəsi"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Sərbəst"
@@ -5484,141 +5515,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 "Bəli"
 
-#: 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 "Xeyir"
 
 #. 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 "Namə'lum"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Təkrarlanan"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Seçili üzvlər silinir"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Üzvlər yenilənir"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Yeni _Görüş..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Yeni Bütün Günlük _Hadisə"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Yeni Görüş"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Yeni Vəzifə"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "Ç_ap et..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Yapışdır"
-
-#: 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 "_Bugünə Get"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "Tarixə _Get..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "Sərbəst/Məşğul Mə'lumatını _Dərc Et"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Aç"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Fərqli _Qeyd Et..."
-
-#: 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 "Kə_s"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Köçür"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Görüş Planlaşdır..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "iCalendar şəklində ö_tür..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Bu _Vaqiəni Sil"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "_Bütün Vaqiələri Sil"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Qurğular..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5663,32 +5592,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 "Seçili üzvlər silinir"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Üzvlər yenilənir"
+
+#: 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 "_Aç"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "_Veb Səhifəsini Aç"
 
-#: 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 "Fərqli _Qeyd Et..."
+
+#: 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 "Ç_ap et..."
+
+#: 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 "Kə_s"
+
+#: 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 "_Köçür"
+
+#: 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 "_Yapışdır"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Vəzifə Tə'yin Et"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "iCalendar şəklində ö_tür"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "Bitmiş Olaraq _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Seçili Vəzifələri Bitmiş Olaraq _İşarələ"
 
-#: 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 "Seçili Vəzifələri _Sil"
 
-#: 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 "Vəzifə əlavə etmək üçün tıqlayın"
 
@@ -5697,38 +5679,101 @@ msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 msgid "% Complete"
 msgstr "% Bitdi"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmlar"
-
-#: 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 "Bitdi"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Bitiş Tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Bitiş Tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Çoğrafi Mövqe"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Üstünlük"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: 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 "Yeni _Görüş..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Yeni Bütün Günlük _Hadisə"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Yeni Görüş"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Yeni Vəzifə"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "İl_gəyi Seç"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Sil..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "Sərbəst/Məşğul Mə'lumatını _Dərc Et"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Qovluğa _Köçür..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Qovluğa _Daşı..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Görüş Planlaşdır..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "iCalendar şəklində ö_tür..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Bu _Vaqiəni Sil"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "_Bütün Vaqiələri Sil"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "_Bugünə Get"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "Tarixə _Get..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Qurğular..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5760,26 +5805,26 @@ msgstr "%02i dəqiqəlik bölmələr"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -5788,106 +5833,98 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bəli."
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Hər gün"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Hər %d gün"
+msgid_plural "Every %d days"
+msgstr[0] "Hər gün"
+msgstr[1] "Hər gün"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Hər həftə"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Hər %d həftə"
+msgid_plural "Every %d weeks"
+msgstr[0] "Hər həftə"
+msgstr[1] "Hər həftə"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Həftənin hər müəyyən günündə"
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Hər %d həftədən müəyyən gündə"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Həftənin hər müəyyən günündə"
+msgstr[1] "Həftənin hər müəyyən günündə"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " və "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s günü"
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s günü"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "hər ay"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "hər %d ay"
+msgid_plural "every %d months"
+msgstr[0] "hər ay"
+msgstr[1] "hər ay"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Hər il"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Hər %d il"
+msgid_plural "Every %d years"
+msgstr[0] "Hər il"
+msgstr[1] "Hər il"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " toplam %d dəfə"
+#: 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] " toplam %d dəfə"
+msgstr[1] " toplam %d dəfə"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", bitiş tarixi olaraq  "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Başlayır:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Bitir:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Başa Çatdı:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Qalıb:</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 Mə'lumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: 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 "Namə'lum şəxs"
 
 #. 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."
@@ -5895,311 +5932,315 @@ msgstr ""
 "<br> Xahiş edirik, aşağıdakı mə'lumatı gözdən keçirin və aşağıdakı menyudan "
 "gedişatı seçin."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Mövqe:"
+
 #. 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 "Vəziyyət:"
 
-#: 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 "Qəbul Edildi"
 
-#: 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 "Əvvəlcədən Qəbul Edildi"
 
-#: 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 "Rədd Edildi"
 
-#: 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 "Gedişatı seçin:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Yenilə"
 
-#: 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 "Oldu"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Əvvəlcədən qəbul et"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini yenilə"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Ən Son Mə'lumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: 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> görüş mə'lumatını dərc edib."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Görüş Mə'lumatı"
 
-#: 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> %s şəxsinin görüşdə olmasını xahiş edir."
 
-#: 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> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: 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> mövcud görüşə əlavə etmək istəyir."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Görüş Yenilənməsi"
 
-#: 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> ən son görüş mə'lumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Görüş Yenilənmə İstəyi"
 
-#: 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> görüş istəyini cavabladı."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: 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> görüşü ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: 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> pozğun ismarış yolladı."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: 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> vəzifə mə'lumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Vəzifə Mə'lumatı"
 
-#: 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> %sdan vəzifəni görməsini istədi."
 
-#: 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> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: 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> mövcud vəzifəyə qoşulmaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Vəzifə Yenilənməsi"
 
-#: 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> ən son vəzifə mə'lumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Vəzifə Yeniləmə İstəyi"
 
-#: 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> vəzifə tapşırığına cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: 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> vəzifəni ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: 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> sərbəst/məşğul mə'lumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatı"
 
-#: 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> sizin sərbəst/məşğul mə'lumatınızı istəyir."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: 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> sərbəst/məşğul istəyinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: 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 "Bu ismarış düzgün formlanmayıbdır"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "İsmarış ancaq dəstəklənməyən istəkləri daxil edir."
 
-#: 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 "Əlavə hökmlü təqvim ismarışını daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Əlavə göstərilə bilən təqvim üzvlərini daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Təqvim faylı yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Yeniləmə başa çatdı\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 ""
 "İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü yenilənə bilməz"
 
-#: 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 "Cism hökmsüzdür və yenilənə bilməz\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 "Cavabı göndərən iştirakçı deyil.  İştirakçı olaraq əlavə edilsin?"
 
-#: 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 "İştirakçı vəziyyəti səhv haldan ötrü yenilənə bilmədi!\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 "CORBA sistemində bir xəta baş verdi\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Cism tapıla bilmədi!\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 "Təqvimi yeniləmək üçün düzgün səlahiyyətləriniz yoxdur\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti yeniləndi\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Çıxartma Başa Çatdı"
 
-#: 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 "Üzv göndərildi!\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 "Üzv göndərilə bilmədi!\n"
 
@@ -6334,7 +6375,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6416,12 +6457,12 @@ msgstr "Vaciblik:"
 msgid "Web Page:"
 msgstr "Veb Səhifəsi:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ünvanını açmaq üçün tıqlayın"
 
-#: 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"
@@ -6431,7 +6472,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"
@@ -6442,12 +6483,12 @@ msgstr ""
 "vəzifə arxa ara üzü\n"
 " iflas etdi."
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtı açılır"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6456,49 +6497,54 @@ msgstr ""
 "%s açılırkən xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Vəzifələr başa çatdırılır..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Seçili cismlər silinir..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Geri alma"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Vəzifələrin yüklənməsi"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Görüş - %s"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Vəzifələrin yüklənməsi"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılması"
 
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 "%s\n"
 "təqvim arxa ara üzü\n"
 " iflas etdi."
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"%s\n"
+"vəzifə arxa ara üzü\n"
+" iflas etdi."
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Silmə"
 
@@ -6519,45 +6565,46 @@ msgid "February"
 msgstr "Fevral"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Tarixə Get"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Yanvar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "İyul"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "İyun"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Mart"
 
-#: 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 "Noyabr"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktyabr"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Bütün mətni seç"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Sentyabr"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Bugünə Get"
+msgid "_Select Today"
+msgstr "Qovluq seçin"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6647,7 +6694,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Ad Günləri & Bayramlar"
 
 #. 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 "Vebdə"
 
@@ -6804,81 +6851,81 @@ msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün ( %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 %b %d"
 
-#: 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 "Seçili həftə (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Seçili il (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Vəzifə"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Vəziyyət: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Vaciblik: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Başa Çatmış Nisbət: %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 "Kateqoriyalar: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Əlaqələr: "
 
-#: 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 "Çap Nümayişi"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Üzvü Çap Et"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
@@ -6887,36 +6934,36 @@ msgstr "Çap Qurğuları"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Yeni vəzifə yarat"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Yeni vəzifə siyahısı"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Vəzifə Siyahısı"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Yeni vəzifə siyahısı yarat"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8560,7 +8607,7 @@ msgstr "Ön yaddaş cığırı yaradıla bilmədi"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ön yaddaş girişi silinə bilmədi: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8571,7 +8618,7 @@ msgstr ""
 "Bu vericidəki növbəti əməliyyatlarınızın şəbəkəyə yenidən bağlanmadığınız\n"
 "vaxt təkrar edilməyəcəkdir."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8582,7 +8629,7 @@ msgstr ""
 "%s\n"
 "Bu qovluqda aparılmış dəyişikliklər yenidən sinxronlaşdırmayacaqdır."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Verici ilə yenidən sinxronlaşdırılır"
 
@@ -8599,7 +8646,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "%s qovluğu xətdən qoparılmaq üçün hazırlanır"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Bu əməliyyatı bitirmək üçün xətdə olmalısınız"
 
@@ -8714,30 +8761,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "Namə'lum başlıqda sorğu aparılır: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: ismarış əlavə et"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: ifadəyə görə axtar"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: uid-ə görə axtar"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "İsmarışlar daşınır"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "İsmarışlar köçürülür"
 
-#: 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 "Yeni ismarış(lar) süzülür"
 
@@ -8771,7 +8822,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 "Ləğv edildi."
 
@@ -9142,7 +9194,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtmacavabı alındı."
 
@@ -9341,7 +9393,7 @@ msgstr "Oxuma xətası"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Verici: %s, Növ: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alına bilmir: Mənbədə hökmsüz əməliyyat"
 
@@ -9350,21 +9402,22 @@ msgstr "Qovluq alına bilmir: Mənbədə hökmsüz əməliyyat"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Zibil"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "İyun"
@@ -9596,17 +9649,17 @@ msgstr "%s içində %s bənzəri ismarış yoxdur"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
@@ -9641,40 +9694,39 @@ msgstr "Bu vericidə GƏLƏNLƏR qutusundaki yeni ismarışlara filtrləri tətb
 msgid "Automatically synchronize remote mail locally"
 msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Verici Adı"
+msgid "Address Book And Calendar"
+msgstr "Ünvan Dəftəri"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Axtarış bazası:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Şifrə"
 
-#: 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 "Bu seçim IMAP vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "siyahı"
@@ -9682,12 +9734,12 @@ msgstr "siyahı"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %s"
@@ -9745,12 +9797,12 @@ msgstr "Qovluq dağıdılıb vericidə yenisi yaradıldı."
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışlar axtarılır"
 
-#: 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 "İsmarış alına bilmədi: %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
@@ -9766,25 +9818,25 @@ msgstr ""
 "İsmarıc alına bilmir: %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 "Belə ismarış yoxdur"
 
-#: 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 "Bu ismarış hazırda mövcud deyil"
 
-#: 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 "Yeni ismarışların icmal mə'lumatı alınır"
 
-#: 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 "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -9860,18 +9912,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP vericilərində məktubların saxlanması və oxuna bilməsi üçün."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP vericisi"
 
-#: 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 "%2$s üstündə %1$s üçün IMAP xidmətləri"
 
-#: 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
@@ -9881,15 +9933,15 @@ msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s-a bağlana bilmədi (qapı %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
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "TLS Mövcud Deyil"
 
-#: 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
@@ -9897,49 +9949,49 @@ msgstr "TLS Mövcud Deyil"
 msgid "Connection cancelled"
 msgstr "Bağlantı ləğv edildi"
 
-#: 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 "%2$s təhlükəsizlik modunda %1$s IMAP verisicinə bağlana bilmədi"
 
-#: 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 uzantısı dəstəklənmir."
 
-#: 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 danışıqları bacarılmadı"
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "%s-a bağlana bilmədi (qapı %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi istənən %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s tanıtma növü dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sXahiş edirik, %s@%s üçün IMAP şifrəsini bildirin"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Şifrənizi bildirmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9950,32 +10002,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "%s adında qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün hökmsüzdür"
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün hökmsüzdür"
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Namə'lum qonşu qovluq: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Qonşu qovluq alt qovluqlara malik ola bilməzi"
 
@@ -10008,20 +10061,20 @@ msgid "Index message body data"
 msgstr "Əlaqəyə ismarış göndər"
 
 #. $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 "poçt qutusu:%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)"
@@ -10077,7 +10130,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"
@@ -10126,8 +10179,8 @@ msgstr "`%s' qovluq mündəricat faylı silinə bilmədi: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' qovluq indeks faylı silinə bilmədi: %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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "`%s' qovluq mündəricat faylı silinə bilmədi: %s"
@@ -10157,14 +10210,14 @@ msgstr "Hökmsüz ismarış məzmunu"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' qovluğu mövcud deyil."
@@ -10183,7 +10236,7 @@ msgstr "`%s' maildir qovluğu deyil."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmədi: %s"
@@ -10192,28 +10245,28 @@ msgstr "`%s' qovluğu silinə bilmədi: %s"
 msgid "not a maildir directory"
 msgstr "maildir qovluğu deyil"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %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 "maildir qovluğu cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Qovluq ardıcıllığı yoxlanır"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Yeni ismarışlar yoxlanır"
 
-#: 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
@@ -10261,7 +10314,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İsmarış quruluşu bacarılmadı: Məktub qutusu xəsərlidir?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Bu adda qovluq yaradıla bilmir"
@@ -10292,32 +10345,32 @@ msgstr "`%s' normal fayl deyil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyil. Silinmədi."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "%s qovluğu yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
@@ -10361,7 +10414,7 @@ msgstr "Mənbə qovluğu bağlana bilmədi: %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmədi: %s"
@@ -10404,14 +10457,14 @@ msgstr "MH ismarış əlavəsi ləğv edildi"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "İsmarış mh qovluğuna əlavə edilə bilmir: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "`%s' qovluğu yaradıla bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Qovluq alına bilmir: %s: %s"
@@ -10698,47 +10751,47 @@ msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Namə'lum xəta: %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 "Belə qovluq yoxdur: %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 "Qrup alına bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "İsmarış göndərilə bilmədi: %s"
 
-#: 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 əmri iflas etdi: %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: Yeni ismarışlaryoxlanır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Naməlum verici cavabı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Ləğv etməni işlət"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Əməliyyat bacarılmadı: %s"
@@ -10785,7 +10838,7 @@ msgstr "%s gün sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bütün POP3 uzantı dəstəklərini qeyri-fəallaşdır"
 
-#: 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"
 
@@ -10874,7 +10927,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10928,12 +10981,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: 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 "Uzaq məktub yayıcısına SMTP ilə bağlanaraq məktub göndərmək üçün.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11052,13 +11106,14 @@ msgid "server does not appear to support SSL"
 msgstr "deyəsən verici SSL xidmətini dəstəkləmir"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS üçün vaxt dolması məcbur qılınsın: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP əmri iflas etdi: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS cavablama xətası"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP əmri iflas etdi: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11092,153 +11147,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "%s vasitəsilə SMTP məktub göndərilməsi"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: 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 "İsmarış göndrərilə bilmədi: bir ya da daha çox hökmsüz alıcı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO istəyi vaxt dolması: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO cavablama xətası"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismini yaratma xətası."
 
-#: 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 istəyi vaxt dolması: %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 əmri iflas etdi: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH istəyi bacarılmadı."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP əmri iflas etdi: %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 "Vericidən xətalı tanıtma istəyi alındı.\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 istək vaxt dolması: %s: məktub göndərilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM cavablama xətası"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP əmri iflas etdi: %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 "RCTP TO istəyi vaxt dolması: %s: məktub göndərilmədi"
 
-#: 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> bacarılmadı"
 
-#: 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 istəyi vaxt dolması. %s: məktub göndərilmədi"
 
 #. 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 cavablama xətası"
-
-#: 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 göndərmə vaxt dolması: ismarış ləğvi: %s: məktub göndərilmədi"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA ləğvi cavablama xətası"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP əmri iflas etdi: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET istəyi vaxt dolması: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET cavablama xətası"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT istəyi vaxt dolması: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT cavablama xətası"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP əmri iflas etdi: %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 "ilişdirilmiş fayl"
 
-#: 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 "Seçili üzvləri ilişdirilmiş fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "İlişdirilmiş fayl əlavə et..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl ilişdir"
 
-#: 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 "Fayl ilişdirilə bilmir: %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 "%s faylı ilişdirilə bilmir: sıravı fayl deyil"
@@ -11260,20 +11319,20 @@ msgstr "MIME növü:"
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmiş faylın avtomatik göstərilməsini məsləhət et"
 
-#: 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 "Məktub yazmadan əvvəl bir hesab quraşdırmalısınız."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Yollanacaq hədəf"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "İsmarışa bir fayl ilişdir"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Ünvan kitabçası üçün buraya tıqlayın"
 
@@ -11284,45 +11343,45 @@ msgstr "Ünvan kitabçası üçün buraya tıqlayın"
 #. * 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 "Cavablama-Ünvanı:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Mövzu:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın alıcılarını bildirin"
 
-#: 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 "İsmarışın nüsxəsinin göndəriləcəyi ünvanları bildirin"
 
-#: 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."
@@ -11333,11 +11392,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Yolla:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
@@ -11346,19 +11405,19 @@ msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 msgid "Attach file(s)"
 msgstr "Fayl(lar) ilişdir"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11367,30 +11426,30 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazılsın?"
 
-#: 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 "Faylı qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Faylı yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarış alına bilmir"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11399,7 +11458,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11408,7 +11467,7 @@ msgstr ""
 "Fayl parçalana bilmir: %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"
@@ -11417,7 +11476,7 @@ msgstr ""
 "Fayl izahatçısı köçürülə bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11426,7 +11485,7 @@ msgstr ""
 "İsmarışın avtomatik qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11435,7 +11494,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etmək istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11447,42 +11506,47 @@ msgstr ""
 "Dəyişiklikləri qeyd etmək istəyirsiniz?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Çoxlu İsmarış"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Diqqət: Təkmilləşdirilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "İmza:"
-
-#: 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 "Avtomatik yarat"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "İmza:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "İsmarış yaz"
 
-#: 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."
@@ -11490,7 +11554,7 @@ msgstr ""
 "Tərtib pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: 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"
@@ -11502,7 +11566,7 @@ msgstr ""
 "Xahiş edirik, gtkhtml və ləbgtkhtml tə'minatlarının\n"
 "düzgün buraxılışlarına malik olduğunuzdan əmin olun.\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."
@@ -11510,7 +11574,7 @@ msgstr ""
 "Tərtib pəncərəsi yaradıla bilmir:\n"
 "HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11632,7 +11696,7 @@ msgid ""
 msgstr ""
 "Oxunma xəbərdarlığı istəyən ismarış aldığınızda, Evolution nə etməlidir?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11640,15 +11704,15 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da mövcuddur.\n"
 "Üstünə yazılsın?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazılsın?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Bu şifrəni yadda saxla"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Hazırkı iclas boyunca bu şifrəni yadda saxla"
 
@@ -11731,13 +11795,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11746,118 +11810,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 saniyə əvvəl"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 saniyə əvvəl"
+msgstr[1] "1 saniyə əvvəl"
 
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d saniyə əvvəl"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 dəqiqə əvvəl"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 dəqiqə əvvəl"
+msgstr[1] "1 dəqiqə əvvəl"
 
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d dəqiqə əvvəl"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 saat əvvəl"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d saat əvvəl"
+msgid_plural "%d hours ago"
+msgstr[0] "1 saat əvvəl"
+msgstr[1] "1 saat əvvəl"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 gün əvvəl"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d gün əvvəl"
+msgid_plural "%d days ago"
+msgstr[0] "1 gün əvvəl"
+msgstr[1] "1 gün əvvəl"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 həftə əvvəl"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d həftə əvvəl"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 həftə əvvəl"
+msgstr[1] "1 həftə əvvəl"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 ay əvvəl"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d ay əvvəl"
+msgid_plural "%d months ago"
+msgstr[0] "1 ay əvvəl"
+msgstr[1] "1 ay əvvəl"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 il əvvəl"
+msgid_plural "%d years ago"
+msgstr[0] "1 il əvvəl"
+msgstr[1] "1 il əvvəl"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d il əvvəl"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Tarix seçməlisiniz."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<vaxtı seçmək üçün buraya tıqlayın>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "indi"
 
 #. 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 "Müqayisə ediləcək vaxtı seçin"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Filtr Qaydaları"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Fayl adı bildirməlisiniz."
 
-#: 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 "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Faylı seç"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Onda"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Qalıb:</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Qovluq bildirməlisiniz."
 
-#: 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 "Qovluğu Seç"
 
@@ -11871,23 +11923,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 "Vacib"
 
 #. 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 "Ediləcəklər"
 
 #. 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 "Sonra"
 
-#: 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 "Sınaq"
 
@@ -11895,59 +11947,64 @@ msgstr "Sınaq"
 msgid "You must name this filter."
 msgstr "Bu filtrə ad verməlisiniz."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Qayda adı: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Əgər"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Qalıb:</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Gedişatı işə sal"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "gələn"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "gedən"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Bununla müqayisə et"
+#, fuzzy
+msgid "    "
+msgstr "      "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Filtrləri Dəyişdir"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filtr Qaydaları"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "VQovluqları Dəyişdir"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vQovluq Mənbələri"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Bununla müqayisə et"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Gələn"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Gedən"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -11955,7 +12012,7 @@ msgstr ""
 "Bu ismarışın tarixi burada göstərdiyiniz ilə\n"
 "müqayisə ediləcəkdir."
 
-#: 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."
@@ -11963,7 +12020,7 @@ msgstr ""
 "Bu ismarışın tarixi filtrin işlədiyi vaxt\n"
 "ilə müqayisə ediləcəkdir."
 
-#: 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."
@@ -11971,59 +12028,51 @@ msgstr ""
 "Bu ismarışın tarixi filtrin işlədiyi vaxt\n"
 "hazırkı tarix ilə müqayisə ediləcəkdir."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtual Qovluqlar"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "indiki vaxta görə müddət"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "əvvəl"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "ay"
 
-#: 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 "saniyə"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "təkcə xüsusi qovluqlar"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "indiki vaxt"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "bildirdiyininiz vaxt"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vQovluq Mənbələri"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "həftə"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "bütün fəal uzaq qovluqlarla"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "bütün yerli və fəal uzaq qovluqlarla"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "bütün yerli qovluqlarla"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "il"
 
@@ -12157,7 +12206,7 @@ msgstr "Bayraqlı deyilsə"
 msgid "Junk Test"
 msgstr "İyun"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12189,8 +12238,9 @@ msgid "Move to Folder"
 msgstr "Qovluğa Daşı"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "İsmrışı Qabıq Əmrinə Göndər"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Proqramdan çıx"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12224,23 +12274,24 @@ msgstr "bundan böyük cavab göndərirsə"
 msgid "returns less than"
 msgstr "bundan kiçik cavab göndərirsə"
 
-#: 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 "Proqramı işə sal: "
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Vəziyyəti Dəyişdir"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Qabığ Əmri"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
@@ -12265,9 +12316,9 @@ msgstr "bununla başlayırsa:"
 msgid "Stop Processing"
 msgstr "Oxumağı Dayandır"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Mövzu"
@@ -12276,17 +12327,13 @@ msgstr "Mövzu"
 msgid "Unset Status"
 msgstr "Vəziyyəti Geri Al"
 
-#: 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 "'%s' qayda adı xas olmalıdır, başqasını seçin."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Qaydalar"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
 
@@ -12298,8 +12345,9 @@ msgstr "Qaydanı Dəyişdir"
 msgid "Rule name"
 msgstr "Qayda adı"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Xal Qaydaları"
 
 #: filter/searchtypes.xml.h:1
@@ -12334,15 +12382,20 @@ msgstr "Mövzu bunu daxil etsin"
 msgid "Subject does not contain"
 msgstr "Mövzu bunu daxil etməsin"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtual Qovluqlar"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Bu vqovluğa ad verməlisiniz."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "VQolvuq mənbəsi"
 
@@ -12391,8 +12444,8 @@ msgstr "Evolutionun Məktub qovluğu nümayişcisi"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Poçt xassələri idarəsi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Məktub"
@@ -12401,53 +12454,50 @@ msgstr "Məktub"
 msgid "Mail Accounts"
 msgstr "Poçt Hesabları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Silmə"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Ön qurğulu]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Hesab adı"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokol"
 
-#: 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 "Adsız"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Hökmlü skript adı bildirməlisiniz."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[skript]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Dil(lər)"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Skript imzası əlavə et"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_İmza Əlavə Et"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
@@ -12503,7 +12553,7 @@ msgstr ""
 "Bu hesabın qovluğu açıla bilmədi.\n"
 "Ön qurğulu layihə qovluğunu işlətmək istəyirsiniz?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Axtarışdan _Virtual Qovluq Yarat..."
 
@@ -12537,297 +12587,327 @@ msgstr "_Sonrakı Oxunmamış İsmarış"
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Yeni Qovluq Yarat"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri bildirin:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Qovluq _adı:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "VQovluqlar"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Gələnlər qutusu"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Yüklənir..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "%s qovluğu çıxardılır"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "%s qovluğu açılır"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "İsmarışlar %s qovluğuna daşınır"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "İsmarışlar %s qovluğuna köçürülür"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "%s qovluğu saxlanılır"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni qovluq yarat"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "`%s' qovluğu silinə bilmədi: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"-i Sil"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Qovluğu Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Görünüş"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pəncərədə Aç"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Daşı"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Yeni Qovluq..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Xassələr..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Yaz"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Yaz"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Yaz"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "Ö_tür"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "_Bitirilmiş olaraq işarələ"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Sil"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq işarələ"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçür..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Filtrləri _Tətbiq Et"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Filtr Qaydaları"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "_Mövzuya görə VQovluğa"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara görə VQovluğa"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma _Qrupuna görə VQovluğa"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "_Mövzuya görə filtrlə"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "_Göndərənə görə filtrlə"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıya görə filtrlə"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupuna görə filtrlə"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "_Göndərənə görə filtrlə"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Ön qurğulu"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Körpü Ünvanını Köçür"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Nəticələr:"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Vəzifələndirilmiş"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -12836,12 +12916,12 @@ msgstr ""
 "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
 "bilmir."
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "İmzanı dəyişdir"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -12850,100 +12930,100 @@ msgstr ""
 "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
 "bilmir."
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "İmzanı qeyd et"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Kəsildi"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP Şifrələməsi"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifikat hələ hökmlü deyil"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Gecikmiş işlər:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Daxili Olaraq Göstər"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Gizlə"
@@ -12953,128 +13033,163 @@ msgstr "Gizlə"
 msgid "Page %d of %d"
 msgstr "Səhifə: %d (Cəmi %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
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "%s ismarışı alınır"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%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 "Yerli faylı (%s) göstərən ox \"%s\" saytında hökmlüdür"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylı (%s) göstərən ox"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq mə'lumatı (%s) göstərən ox"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Namə'lum xarici mə'lumatı göstərən ox (\"%s\" növündə)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "İsmarışlar daşınır"
 
-#: 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 "Göndərən"
 
-#: 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 "Cavablama-Ünvanı"
 
-#: 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 "Alıcı:"
 
-#: 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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Göndərici"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: 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 ilişdirilmiş fayl"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Dəstəklənməyən sxem"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Hər il"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Hər həftə"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "hər ay"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13083,22 +13198,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "%s ön yaddaşa alına bilmədi: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "%s ön yaddaşa alına bilmədi: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "`%s' qovşağı tapıla bilmədi: %s"
@@ -13141,34 +13256,34 @@ msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
 msgid "Open in %s..."
 msgstr "%s ilə aç..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Qeydiyyatdan Keç"
 
-#: 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 "Qovluq"
 
 #. 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 "Xahiş edirik, verici seçin."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Heç bir verici seçilməyib"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Bu ismarışı bir də göstərmə."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13177,27 +13292,27 @@ msgstr ""
 "Filtr mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtrlər"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Ötürülmüş İsmarış"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "namə'lum yollayan"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M tarixində %%s yazmışdır ki:"
 
-#: 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"
@@ -13206,7 +13321,7 @@ msgstr ""
 "`%s' mövqeyinə qeyd edilə bilmir\n"
 " %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13215,38 +13330,38 @@ msgstr ""
 "%s onsuz da mövcuddur.\n"
 "Üstünə yazılsın?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "İsmarış"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "Ünvan"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "%s-dan məktub"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13259,7 +13374,7 @@ msgstr ""
 "\n"
 "Bu ismarışlar həqiqətən də silinsin?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13337,173 +13452,195 @@ msgstr "İsmarışın ön qurğulu mövzusu."
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "İsmarışın ön qurğulu mövzusu."
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "Cavab _tərzi:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
 
-#: 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 "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Poçt Hesabları"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Gedişatı işə sal"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13512,102 +13649,114 @@ msgstr ""
 "HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
 "istə"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "HTML Məktubu Göndərilsin?"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "HTML Məktubu Göndərilsin?"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "İsmarışı normal tərzdə göstər"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Nümayiş Paneli"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Yeni məktub alındığında _səs çal"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Spell check inline"
 msgstr "İmla _Yoxlaması"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminal Yazı Növü:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Çap üçün HTML dəyişən yazı növünü seç"
 
-#: 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;"
@@ -13615,113 +13764,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "İlgəklənmiş İsmarış Siyahısı"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "İlgəklənmiş İsmarış Siyahısı"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Bu hesabı ön _qurğulu hesabım et"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Dəyişən-en:"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "İdxal Et"
@@ -13761,14 +13910,14 @@ msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
 #: 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 "İdxal edilir..."
 
 #: 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 "Xahiş edirik gözləyin"
 
@@ -13817,12 +13966,12 @@ msgstr "Fayllar İdxal Edilir"
 msgid "Scanning %s"
 msgstr "%s oxunur"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Əsas Filtr \"%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"
@@ -13837,7 +13986,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13845,7 +13994,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13854,24 +14003,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Qurğular"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Poçt Filtrləri"
 
-#: 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?"
@@ -13904,62 +14053,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Hazırkı saxlama şəkli:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Məktub məzmununu indekslə"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Yeni saxlama şəkli:"
-
-#: 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 ""
-"Qeyd: Məktub qutuları şəkli arasında keçişlərdə xətanın\n"
-"(disk sahəsi çatışmamazlığındakı kimi) avtomatik olaraq \n"
-"bərpası mümkün olmaya bilər. Bu xüsusiyyəti ehtiyatla işlədin."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "məktub qovluğu"
-
-#: 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 "Lazımi bütün mə'lumatlar verilməlidir."
 
 #. 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 Hesab Editoru"
 
-#: 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 "_Qovşaq:"
 
-#: 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 "_İstifadəçi adı:"
 
-#: 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 "_Cığır:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adla iki hesab yarada bilməzsiniz."
 
@@ -13992,11 +14107,11 @@ msgstr "Cavablanan: %s"
 msgid "Add Filter Rule"
 msgstr "Filtr Qaydası Əlavə Et"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Aşağıdakı filtr qaydaları:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14007,82 +14122,83 @@ msgstr ""
 "    '%s'\n"
 "O yeniləndi."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Yeni məktub ismarışı yaz"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Yeni VQovluq"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poçt Filtrləri"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Yeni təqvim yarat"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: 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 "Şəxsiyyət"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: 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 "
@@ -14091,127 +14207,259 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Yoxlama Xidməti"
 
-#: 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 "Vericiyə bağlanır..."
 
-#: 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 " Dəstəklənən növləri _yoxla "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Nümayiş"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Vəziyyət:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Vəziyyət:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
-"Şifrələnmiş məktub göndərildiyi vaxt məktubu _həmişə mənim üçün də şifrələ"
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Hesab Editoru"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Hesab Mə'lumatı"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Yeni Məktubların Yoxlanması"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "S_kript Əlavə Et"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Yeni imza əlavə et..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
-"Şifrələnmiş məktub göndərildiyi vaxt məktubu həmişə _mənim üçün də şifrələ"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Bu ünvana həmişə məktubun _gizli nüsxəsini (Bcc) yolla:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Bu ünvana həmişə məktubun _nüsxəsini (Cc) yolla:"
+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 "Yeni Məktub Bildirişi"
+
+#: 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 "Göndərilən və Layihə İsmarışları"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr ""
+"Şifrələnmiş məktub göndərildiyi vaxt məktubu _həmişə mənim üçün də şifrələ"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Hesab Editoru"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Yeni imza əlavə et..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "S_kript Əlavə Et"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+"Şifrələnmiş məktub göndərildiyi vaxt məktubu həmişə _mənim üçün də şifrələ"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Bu ünvana həmişə məktubun _nüsxəsini (Cc) yolla:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Bu ünvana həmişə məktubun _gizli nüsxəsini (Bcc) yolla:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Şifrələrkən açar dairəmdəki açarlara _həmişə e'tibar et"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Orijinal ismarışı ilişdir"
 
-#: 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 "İlişdirilmiş fayl"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Tanıtma"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "Emosiya rəsmlərini avtomatik olaraq _daxil et"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "Yeni məktub alındığında _bip səsi çıxart"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "_Hərf dəstəsi:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Rənglər"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Yeni Məktubların Yoxlanması"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Yazdığımda imlanı _yoxla"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Yeni Məktubların Yoxlanması"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Səhv imlalı mətnin _rəngi:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "İsmarışların Yazılması"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Rənglər"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Quraşdırma"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Qovluq həmişəlik silinirkən _təsdiq istə"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14227,307 +14475,292 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tətbiq Et\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Ön _qurğulu"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Ön Qurğulu Davranış"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Ön qurğulu hərf _kodlaması:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Poçtun Silinməsi"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
+msgid "Defaults"
+msgstr "Ö_n qurğular"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Orijinal ismarışı sitatlama"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Görüş istəklərini _imzalama (Outlook ilə uyğunluq üçün)"
 
-#: 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 "Başa çatdı"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Layihələr qovluğu:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Epoçt Hesabları"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "_Epoçt ünvanı:"
 
-#: 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 "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Bələdçisi"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Əmr İcra Et..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "_Tən-aralıqlı en:"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Filtrlər"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Yazı Növü Qurğuları"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "İsmarışları _HTML olaraq şəkilləndir"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML Məktub"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "Başlıq"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _işıqlandır:"
 
-#: 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 "Daxili"
 
-#: 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 "Etiket və Rənglər"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Rəsmlərin Yüklənməsi"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Poçt Qurğuları"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Məktub qutusu mövqeyi"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "İsmarış Tərtib Edicisi"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "İsmarış Görünüşü"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "İsmarış Yazı Növləri"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Yeni Məktub Bildirişi"
-
-#: 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"
 msgstr ""
 "Qeyd: İlk dəfə bağlanana dək sizdən şifrənizi daxil etməniz istənəcəkdir"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Arzuya Bağlı Mə'lumatlar"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Açar ID-si:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Rəng seç"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "Yeni məktub alındığında _səs çal"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: 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 "Çap Edilən Yazı Növləri"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Qmail poçt qovluğu"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr "Orijinal ismarışı sitatlandır"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Bu şifrəni _yadda saxla"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Şifrəni yadda saxla"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "_Cavablama-Ünvanı:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Alınma _Seçimləri"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Bu şifrəni _yadda saxla"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Lazımi Mə'lumat"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Şifrəni yadda saxla"
 
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Ön Qurğulara Geri Dön"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Standart Yazı Növü:"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "E'tibarlı MIME (S/MIME)"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Çap üçün HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Çap üçün HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Sil..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Göndərilən və Layihə İsmarışları"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmanı məcbur qılır"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Verici Qurğuları"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "İmza:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_İmzalar"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Fayl adı _bildir:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "İmla _Yoxlaması"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Terminal Yazı Növü:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Növ:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
 "dictionary installed."
 msgstr ""
 
-#: 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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Dəyişən-en:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14537,181 +14770,112 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_İmza Əlavə Et"
 
-#: 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 "_Netdən rəsmləri həmişə yüklə"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Tanıtma Növü: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Tanıtma növü: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "Emosiya rəsmlərini avtomatik olaraq _daxil et"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "Yeni məktub alındığında _bip səsi çıxart"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "Qovluq həmişəlik silinirkən _təsdiq istə"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "Ön qurğulu _imza:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "Ö_n qurğular"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni məktub alındığında bildirmə"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Fəallaşdır"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "Ötürmə _tərzi:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Tam ad:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML Məktub"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "Şə_xsiyyət"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "İyun"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Yollayan ünvan kitabçasında varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "Bu hesabı ön _qurğulu hesabım et"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "İsmarışları oxunmuş olaraq işarələmə _vaxtı:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: 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 "Netdən rəsmləri _qətiyyən endirmə"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "Yeni məktub alındığında _səs çal"
-
-#: 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 ""
 "HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
 "istə"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzulu məktub göndərdiyimdə təsdiq istə"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "Poçt _Alınması"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "Cavab _tərzi:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "Ön qurğulara geri _dön"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Sil..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "Poçtun _Göndərilməsi"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_İmzalar"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Standart Yazı Növü:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminal Yazı Növü:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_E'tibarlı bağlantı (SSL) işlət:"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Diqər proqramların işlətdiyi yazı növlərini işlət"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "dəqiqə"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "rəng"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "izahat"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pinglənir"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14720,7 +14884,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14729,7 +14893,7 @@ msgstr ""
 "Əməliyyat aparılırkən xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "İşləyir"
 
@@ -14737,16 +14901,16 @@ msgstr "İşləyir"
 msgid "Filtering Folder"
 msgstr "Qovluq Filtrdən Keçirilir"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Göndərmə filtrləri tətbiq edilə bilmədi: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14755,116 +14919,115 @@ msgstr ""
 "%s faylına əlavə edilə bilmədi: %s\n"
 "Onun əvəzinə yerli 'Göndərilənlər' qovluğuna əlavə edilir."
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "\"%s\" göndərilir"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "%d / %d ismarışında xəta baş verdi"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "%d / %d ismarışında iflas etdi"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Başa çatdı."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"dakı qovluqlar oxunur"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Ötürülmüş ismarışlar"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "%s mənbəsi açılır"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Qovluq silinir"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' içindəki zibil boşaldılır"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "%d ismarış alınır"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d ismarış alınır"
+msgstr[1] "%d ismarış alınır"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "%d ismarış qeyd edilir"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "%d ismarış qeyd edilir"
+msgstr[1] "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14873,7 +15036,7 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14882,11 +15045,11 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "İlişdirilmiş fayl qeyd edilir"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14895,25 +15058,21 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Böyük Kiçik Hərfə Həssas"
@@ -14926,88 +15085,81 @@ msgstr "İsmarışda Axtar"
 msgid "Find:"
 msgstr "Axtar:"
 
-#: mail/mail-search.glade.h:5
-#, fuzzy
-msgid "Search"
-msgstr "A_xtar"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "İmzanı dəyişdir"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Xaric Tutulanlar"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Hesab Mə'lumatı"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Ləğv edilir..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cığır: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Növ: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Məktub Göndər & Al"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Hamısını_ Ləğv Et"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Yenilənir..."
 
-#: 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 "Gözləyir..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün şifrəni bildirin"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Şifrəni Bildirin"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "Hazırkı iclas boyunca bu şifrəni _yadda saxla"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "İmza faylı qeyd edilə bilmir: %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"
@@ -15017,23 +15169,23 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməsini istəyirsiniz?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Dəyişiklikləri nəzərə alma"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "İmzanı qeyd et"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "İmzanı dəyişdir"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Bu imza üçün bir ad bildirin."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Ad:"
 
@@ -15063,17 +15215,17 @@ msgstr "Ötürülmüş ismarış"
 msgid "Invalid folder: `%s'"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vqovluq quraşdırılır: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uri üçün vqovluqlar yenilənir: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15086,84 +15238,84 @@ msgstr ""
 "    '%1$s'\n"
 "Onlar yeniləndilər."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vQovluqlar"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "VQovluğu Dəyişdir"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vqovluğu dəyişdirilməyə çalışılır."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Yeni VQovluq"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Cavab verilmiş"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Daha Alçaq"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Daha Yüksək"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: 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 "Bugün %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Dünən: %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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -15211,7 +15363,7 @@ msgstr "Növbəti"
 msgid "For Your Information"
 msgstr "Nəzərinizə"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Ötür"
 
@@ -15219,11 +15371,11 @@ msgstr "Ötür"
 msgid "No Response Necessary"
 msgstr "Cavab Məcburi Deyil"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Cavab yaz"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Hamısına cavab yaz"
 
@@ -15246,7 +15398,8 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Bitiş vaxtı:"
 
 #: mail/message-tags.glade.h:7
@@ -15467,7 +15620,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Bu üzv üçün görüşü ləğv et"
 
-#: 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 "Xahiş edirik, idxal etmək istədiyiniz mə'lumatı seçin:"
 
@@ -15492,26 +15645,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "İdxalçı seçin"
 
-#: 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 "`%s' faylı mövcud deyil"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "İdxal edilir"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "İdxal edilir"
 
-#: 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 "%s yüklənirkən xəta"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15520,35 +15673,35 @@ msgstr ""
 "%s idxal edilir\n"
 "İdxal edilən üzv 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Fayl seçin"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Başqa proqramlardan verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Tək fayl idxal et"
 
-#: 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"
@@ -15556,26 +15709,26 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "İnternet İdxalçıları Başladılır"
 
-#: 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 "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg icra edilə bilmədi."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "İdxal Et"
@@ -15584,7 +15737,7 @@ msgstr "İdxal Et"
 msgid "Closing connections..."
 msgstr "Bağlantılar bağlanır..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution Qurğuları"
 
@@ -15618,11 +15771,11 @@ msgstr "Bölüşülmüş qovluq açıla bilmir: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Bildirilən bölüşülmüş qovluq tapıla bilmir"
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "İdxal başlanır"
 
-#: 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 "
@@ -15631,11 +15784,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Yardımçı"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Qovluq adı bildirilməyib."
@@ -15677,15 +15825,15 @@ msgstr "Bug buddy işə salına bilmədi."
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Haqqında"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
@@ -15735,7 +15883,6 @@ msgstr "İşarələmə qutusu"
 
 #: 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 "Yeni"
 
@@ -15792,16 +15939,17 @@ msgid "Create a new test item"
 msgstr "Yeni vəzifə yarat"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Fəal Bağlantılar"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Bu bağlantıları kəsərək xətdən qopmaq üçün Oldu-ya tıqlayın"
+msgid "Active Connections"
+msgstr "Fəal Bağlantılar"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Bu bağlantıları kəsərək xətdən qopmaq üçün Oldu-ya tıqlayın"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -15923,28 +16071,28 @@ msgstr ""
 "Bu vasitə ilə xarici fayllarınızı Evolution içinə\n"
 "ala biləcəksiniz."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "İdxalçılar"
 
-#: 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 "İdxal Et"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "İdxal etmə"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Bir də soruşma"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution aşağıdakı fayllardan verilənləri idxal edə bilər:"
 
 #. 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"
@@ -15964,7 +16112,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15972,98 +16120,109 @@ msgstr ""
 "Sağolun\n"
 "Ximian Evolution Komandası\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Bunu bir daha demə"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution qabığına yetişilə bilmir."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution qabığı başladıla bilmir: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Xətdən qopuq modda başla"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Xətdə modunda başla"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Bütün evolution tərkib hissələrini bağlanmaya məcbur et"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Bütün tərkib hissələrinin xəta ayırma verilənlərini bir fayla göndər."
 
-#: 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"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "İdxalçı seçin"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "İrəliləmə"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "İfadə"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-Poçt Ünvanını Birləşdir"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Sertifikatın vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "%s üçün şifrəni bildirin"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "%s üçün şifrəni bildir"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Şifrəni bildir"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16269,7 +16428,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kard ID onsuz da mövcuddur"
@@ -16571,7 +16731,7 @@ msgstr "Əlaqə(lər)ni Başqa Qovluğa Daşı..."
 msgid "Move to Folder..."
 msgstr "Qovluğa _Daşı..."
 
-#: 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 "Ara yaddaşı yapışdır"
 
@@ -16580,8 +16740,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Çap ediləcək əlaqələri nümayiş etdirər"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Çap Nüma_yişi"
 
@@ -16630,13 +16790,13 @@ msgstr "Yükləməni Dayandır"
 msgid "View the current contact"
 msgstr "Hazırkı əlaqəni göstər"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Gedişatlar"
 
@@ -16657,14 +16817,10 @@ msgid "_Save as VCard"
 msgstr "VCard olaraq _Qeyd Et"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "Əlaqə _Axtar"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Hamısını _Seç"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Əlaqəyə İsmarış _Göndər..."
 
@@ -16672,58 +16828,54 @@ msgstr "Əlaqəyə İsmarış _Göndər..."
 msgid "Day"
 msgstr "Gün"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Bütün Vaqeələri Sil"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Görüşü sil"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Bu Vaqeəni Sil"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Bu _vaqeəni sil"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Get"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Geri get"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "İrəli get"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "_Tarixə Get"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Xüsusi tarixə get"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Bugünə get"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Siyahı"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Ay"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Sonrakı"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Əvvəlki"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Bu təqvimi çap et"
@@ -16732,7 +16884,7 @@ msgstr "Bu təqvimi çap et"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Bu təqvim üçün Sərbəst/Məşğul mə'lumatını dərc et"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
@@ -16744,35 +16896,55 @@ msgstr "Görüş və hadisələri daxil edən ictimai qovluq"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Bütün mətni seç"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Xüsusi tarixə get"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Qovluq seçin"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Təfsilatı Göstər"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Bir günü göstər"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Bir ayı göstər"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Bir həftəni göster"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "İş həftəsini göstər"
 
-#: 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 "Bugün"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Hazırkı əlaqəni göstər"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Həftə"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Görüş"
@@ -17041,7 +17213,7 @@ msgstr "Hamısını _Oxunmış Olaraq İşarələ"
 msgid "Mark all visible messages as read"
 msgstr "Bütün görünən ismarışları oxunmuş olaraq işarələ"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Ara yaddaşdakı ismarış(lar)ı yapışdır"
 
@@ -17211,312 +17383,314 @@ msgid "F_orward As..."
 msgstr "Ö_tür"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Filtr Qaydaları"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Məktublaşma _Qrupuna görə filtrlə..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "_Göndərənə görə filtrlə..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "_Alıcılara görə giltrlə..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "_Mövzuya görə filtrlə..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Seçili ismarışları vacib olaraq işarələ"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML məktublardakı rəsmləri yüklənməyə məcbur et"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Seçili ismarışı yeni ismarışın məzmununda ötür"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Seçili ismarışı sitatlı cavab olaraq ötür"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Seçili ismarışı başqasına ötür"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Seçili ismarışı başqasına ilişdirərək ötür"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Mətn böyüklüyünü artır"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "_Rəsmləri Yüklə"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "_Vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Va_cib olmayan olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Seçili ismarışları oxunmuş olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "İsmarışları oxunmamış olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "İsmarışları oxunmamış olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Seçili ismarışları silmə üçün işarələ"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Daşı"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Seçili ismarışları başqa qovluğa daşı"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Sonrakı"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Sonrakı _Vacib İsmarış"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Sonrakı _İlgək"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "_Sonrakı Oxunmamış İsmarış"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Tapıla bilmədi"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Seçili ismarışı yeni pəncərədə aç"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Seçili ismarışı yenidən göndərmək üçün tərtib edicidə aç"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Əsl Bö_yüklük"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "Ə_vvəlki Oxunmamış İsmarış"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Cavab Yaz"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "İctimai qovluqdakı ismarışa cavab yaz"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Əvvəlki _Vacib İsmarış"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Çap ediləcək ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Əvvəlki"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Bu ismarışı çap et"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "İsti_qamətləndir"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçili ismarışı başqasına istiqamətləndir"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Mətni əsl böyüklüyünə sıfırla"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "İsmarışı A_xtar..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "Daha Ki_çik"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "İsmarışı mətn faylı olaraq qeyd et"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Göstərilən ismarışın məzmununda mətni axtar"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Məktub _Mənbəsini Göstər"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "_Bütün Başlıqları Göstər"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Göstərilən ismarışın məzmununda mətni axtar"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "İsmarışı normal tərzdə göstər"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "İsmarışı bütün poçt başlıqları ilə göstər"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "İsmarışın xam mənbəsini göstər"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Mətn Bö_yüklüyü"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Seçili ismarışları geri qətir"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "Məktublaşma _Qrupuna görə VQovluğa..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "_Göndərənə görə VQovluğa..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcılara görə VQovluğa..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "_Mövzuya görə VQovluğa..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_İlişdirilmiş"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Qovluğa _Köçür"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "İsmarışdan Filtr _Yarat"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Get"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Daxili"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "Daha _Geniş"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_İsmarış Görünüşü"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Qovluğa _Daşı"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Sonrakı İsmarış"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Normal Görünüş"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "İsmarışı _Aç"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "Ə_vvəlki İsmarış"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "_Yenidən Göndər..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Vasitələr"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
@@ -17786,40 +17960,40 @@ msgstr "Seçili vəzifəni köçür"
 msgid "Cut selected task"
 msgstr "Seçili vəzifəni kəs"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Başa çatmış vəzifələri sil"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Seçili vəzifələri sil"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Başa Çatmış Olaraq _İşarələ"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Seçili vəzifələri başa çatmış olaraq _işarələ"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Vəzifəni ara yaddaşdan yapışdır"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Çap ediləcək vəzifələr siyahısını göstərir"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Vəzifələr siyahısını çap et"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Seçili vəzifələri sil"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Vəzifə"
@@ -17952,10 +18126,15 @@ msgid "_Day View"
 msgstr "_Gündəlik Nümayiş"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Siyahı Görünüşü"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Aylıq Nümayiş"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "İş _Həftəsi Nümayişi"
 
@@ -17990,10 +18169,16 @@ msgid "_Messages"
 msgstr "İsmarışlar"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "_Kateqoriya İlə"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Bitiş Tarixi:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Vəziyyəti Dəyişdir"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Vəzifələr"
 
@@ -18052,14 +18237,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 "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Bugün"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18069,82 +18250,87 @@ msgstr "Vaxt %s şəklində olmalıdır"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltik"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Mərkəzi Avropa"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Çincə"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Yunanca"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Yəhudicə"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Yaponca"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Koreyaca"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Türkçə"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Yunikod"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Qərbi Avropa"
 
-#: 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 "Qərbi Avropa"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Ənənəvi"
 
-#: 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 "Bəsitləşdirilmiş"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Əyani"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Namə'lum hərf dəstəsi: %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 "Hərf Kodlaması"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "İşlədiləcək hərf dəstəsini bildirin"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Başqa..."
 
@@ -18212,11 +18398,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "A_xtar"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Axtarış Editoru"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
@@ -18237,15 +18428,15 @@ msgstr "Ə_traflı..."
 msgid "Choose Image"
 msgstr "Faylı seç"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "A_xtar"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "İndi _Tap"
 
-#: 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 "_Təmizlə"
 
@@ -18276,6 +18467,334 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% başa çatdı)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Ü_nvan Kitabçası Mənbələri..."
+
+#~ msgid "Selected:"
+#~ msgstr "Seçilən:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 əlaqə"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "və %d başqa əlaqə."
+
+#~ msgid "Send an Email"
+#~ msgstr "Epoçt Göndər"
+
+#~ msgid "1 day"
+#~ msgstr "1 gün"
+
+#~ msgid "1 week"
+#~ msgstr "1 həftə"
+
+#~ msgid "1 hour"
+#~ msgstr "1 saat"
+
+#~ msgid "1 minute"
+#~ msgstr "1 dəqiqə"
+
+#~ msgid "1 second"
+#~ msgstr "1 saniyə"
+
+#~ msgid "Description"
+#~ msgstr "İzahat"
+
+#~ msgid "component"
+#~ msgstr "tərkib hissəsi"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmlar"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Çoğrafi Mövqe"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Hər %d gün"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Hər %d həftə"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Hər %d həftədən müəyyən gündə"
+
+#~ msgid "every %d months"
+#~ msgstr "hər %d ay"
+
+#~ msgid "Every %d years"
+#~ msgstr "Hər %d il"
+
+#~ msgid "Go To Date"
+#~ msgstr "Tarixə Get"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Bugünə Get"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Verici Adı"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_Axtarış bazası:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "STARTTLS üçün vaxt dolması məcbur qılınsın: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "STARTTLS cavablama xətası"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "HELO istəyi vaxt dolması: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "HELO cavablama xətası"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH istəyi vaxt dolması: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH istəyi bacarılmadı."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM cavablama xətası"
+
+#~ msgid "DATA response error"
+#~ msgstr "DATA cavablama xətası"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr "DATA göndərmə vaxt dolması: ismarış ləğvi: %s: məktub göndərilmədi"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA ləğvi cavablama xətası"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "RSET istəyi vaxt dolması: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "RSET cavablama xətası"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "QUIT istəyi vaxt dolması: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "QUIT cavablama xətası"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d saniyə əvvəl"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d dəqiqə əvvəl"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d saat əvvəl"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d gün əvvəl"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d həftə əvvəl"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d ay əvvəl"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d il əvvəl"
+
+#~ msgid "Then"
+#~ msgstr "Onda"
+
+#~ msgid "If"
+#~ msgstr "Əgər"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Filtrləri Dəyişdir"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "VQovluqları Dəyişdir"
+
+#~ msgid "Outgoing"
+#~ msgstr "Gedən"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "İsmrışı Qabıq Əmrinə Göndər"
+
+#~ msgid "Shell Command"
+#~ msgstr "Qabığ Əmri"
+
+#~ msgid "Rules"
+#~ msgstr "Qaydalar"
+
+#~ msgid "[script]"
+#~ msgstr "[skript]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Skript imzası əlavə et"
+
+#~ msgid "Current store format:"
+#~ msgstr "Hazırkı saxlama şəkli:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Məktub məzmununu indekslə"
+
+#~ msgid "New store format:"
+#~ msgstr "Yeni saxlama şəkli:"
+
+#~ 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 ""
+#~ "Qeyd: Məktub qutuları şəkli arasında keçişlərdə xətanın\n"
+#~ "(disk sahəsi çatışmamazlığındakı kimi) avtomatik olaraq \n"
+#~ "bərpası mümkün olmaya bilər. Bu xüsusiyyəti ehtiyatla işlədin."
+
+#~ msgid "maildir"
+#~ msgstr "məktub qovluğu"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
+
+#~ msgid "Account Information"
+#~ msgstr "Hesab Mə'lumatı"
+
+#~ msgid "Authentication"
+#~ msgstr "Tanıtma"
+
+#~ msgid "Composing Messages"
+#~ msgstr "İsmarışların Yazılması"
+
+#~ msgid "Configuration"
+#~ msgstr "Quraşdırma"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Ön Qurğulu Davranış"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Poçtun Silinməsi"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "Filtrlər"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Etiket və Rənglər"
+
+#~ msgid "Loading Images"
+#~ msgstr "Rəsmlərin Yüklənməsi"
+
+#~ msgid "Message Display"
+#~ msgstr "İsmarış Görünüşü"
+
+#~ msgid "Message Fonts"
+#~ msgstr "İsmarış Yazı Növləri"
+
+#~ msgid "Optional Information"
+#~ msgstr "Arzuya Bağlı Mə'lumatlar"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Çap Edilən Yazı Növləri"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Bu şifrəni _yadda saxla"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Bu şifrəni _yadda saxla"
+
+#~ msgid "Required Information"
+#~ msgstr "Lazımi Mə'lumat"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Ön Qurğulara Geri Dön"
+
+#~ msgid "S_ecurity"
+#~ msgstr "_Təhlükəsizlik"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "E'tibarlı MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Verici Qurğuları"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Tanıtma Növü: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Tanıtma növü: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "Ön qurğulu _imza:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Tam ad:"
+
+#~ msgid "_Identity"
+#~ msgstr "Şə_xsiyyət"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "İyun"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "Poçt _Alınması"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "Ön qurğulara geri _dön"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "Poçtun _Göndərilməsi"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "\"%s\" göndərilir"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "%d / %d ismarışında xəta baş verdi"
+
+#, fuzzy
+#~ msgid "Search"
+#~ msgstr "A_xtar"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "İmzanı dəyişdir"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Xaric Tutulanlar"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Yardımçı"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "Əlaqə _Axtar"
+
+#~ msgid "Go to _Date"
+#~ msgstr "_Tarixə Get"
+
+#~ msgid "Go to today"
+#~ msgstr "Bugünə get"
+
+#~ msgid "With _Category"
+#~ msgstr "_Kateqoriya İlə"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Ünvan Kitabçası Mənbələri"
 
@@ -18316,10 +18835,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Scanning directory"
 #~ msgstr "Qovluq oxunur"
 
-#, fuzzy
-#~ msgid "    "
-#~ msgstr "      "
-
 #~ msgid "Cannot copy folder: %s"
 #~ msgstr "Qovluq köçürülə bilmir: %s"
 
diff --git a/po/be.po b/po/be.po
index 2a1ef1a630..9a5f6ffc3a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.be\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2003-05-25 19:42GMT+2\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: belarusian <i18n@mova.org>\n"
@@ -13,6 +13,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\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 "Кніга адрэсаў \"Эвалюцыі\""
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "з усімі лакальнымі й актыўнымі аддаленымі течкамі"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Захаваць як"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Заданьні "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "карткі"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 картка"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Кантакты: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Акно \"Эвалюцыі\""
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Адрэса дапомнае сынхранізацыі:"
@@ -95,78 +137,94 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Уласьцівасьці..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "Новы кантакт:"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Кантакт"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Стварыць новы кантакт"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Новы сьпіс кантактаў"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "Новы сьпіс кантактаў"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Стварыць новы сьпіс кантактаў"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Кніга адрэсаў"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Кніга адрэсаў"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Стварыць новае заданьне"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Збой далучэньня да паслужніка LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Збой аўтарызацыі на паслужніку LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Немагчыма выканаць запыт да карэннага 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 "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Памылка атрыманьня зьвестак схемы"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
 
@@ -192,17 +250,17 @@ msgstr "Зандаваньне %s"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Пэрсанальнае"
 
@@ -259,7 +317,7 @@ msgstr "Праграма гэтае кнігі адрэсаў адмовіла �
 msgid "This query did not complete successfully."
 msgstr "Запыт ня быў пасьпяхова выкананы."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -268,7 +326,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Праверце, што шлях існуе\n"
 "і што у вас ёсьць неабходныя правы доступа."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -277,7 +335,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -289,7 +347,7 @@ msgstr ""
 "перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
 "усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -298,29 +356,29 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік не адказвае."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Далучацца да паслужніка LDAP ананімна"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Збой аўтарызацыі.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
@@ -344,16 +402,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  _Адлюстраваць базы, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -368,62 +420,53 @@ msgstr "  _Адлюстраваць базы, якія падтрымліваю�
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Дапаможнік наладкі LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Крыніцы кнігаў адрэсаў..."
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Крыніцы кнігі адрэсаў..."
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Заўсёды"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Ананімна"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -437,54 +480,54 @@ msgstr ""
 "Калі ласка, клікніце кнопку \"Завершыць\", каб захаваць парамэтры\n"
 "пазначаныя тутака."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Далучэньне"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "_Удакладнёная назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Э.пошта:"
 
-#: 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 ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтае DN для аўтарызацыі на паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтую адрэсу для аўтарызацыі вас на "
 "паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Скончана"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Асноўнае"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Ніколі"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -499,23 +542,19 @@ msgstr ""
 "вашага злучэньня. Спытайце вашага сыстэмнага адміністратара,які пратакол \n"
 "падтрымлівае ваш паслужнік LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Адзін"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Межы _пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Выбранае:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -525,7 +564,7 @@ msgstr ""
 "паслужніка\n"
 "LDAP калі той падтрымлівае SSL ці 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"
@@ -543,7 +582,7 @@ msgstr ""
 "пакуль вашае злучэньне\n"
 "бясьпечнае."
 
-#: 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"
@@ -557,7 +596,7 @@ msgstr ""
 "нетрывалым  да эксплойдаў\n"
 "бясьпекі. "
 
-#: 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 "
@@ -568,7 +607,7 @@ msgstr ""
 "на паслужніку LDAP,\n"
 "і сварэньня і рэдагаваньня кантактаў. "
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -577,35 +616,35 @@ msgid ""
 msgstr ""
 "Пазначае назву якая была вызначана на апошнім кроку наладкі паслужніка LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Крок 1: Зьвесті паслужніка"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Крок 2 : Далучэньне да паслужніка"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Крок 3: Пошук каталёга"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Пад"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Базы пошуку, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -618,7 +657,7 @@ msgstr ""
 "адміністратара,\n"
 "калі вам патрэбна зьмяніць гэтыя опцыі."
 
-#: 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"
@@ -629,7 +668,7 @@ msgstr ""
 "ваш пошук. Калі вы пакініце гэтае поле пустым, пошук будзе пачаты з карэня \n"
 "дрэва каталёгаў."
 
-#: 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"
@@ -645,7 +684,7 @@ msgstr ""
 "узровень\n"
 " за базу пошуку.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -662,14 +701,14 @@ msgstr ""
 "спэцыялізаваную інфармацыю аб паслужніку. Калі ласка,\n"
 "зьвяжыцеся з вашым адміністратарам каб атрымаць яе."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Гэта поўная назва вашага паслужніка LDAP. Да прыкладу, \"mova.linux.by\""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -679,7 +718,7 @@ msgstr ""
 "Гэта максымальная колькасьць запісаў для загрузкі. Усталяваньне  гэтае \n"
 "лічбы ў вялікае значэньне запаволіць вашую кнігу адрэсаў."
 
-#: 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 "
@@ -689,7 +728,7 @@ msgstr ""
 "Усталёўка значэньня у \"Адрэса пошты\"прадастаўляе ананімны доступ да вашага "
 "паслужніка LDAP."
 
-#: 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"
@@ -698,7 +737,7 @@ msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -708,7 +747,7 @@ msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
-#: 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"
@@ -719,28 +758,28 @@ msgstr ""
 "далучэньня. Запытайцеся вашага адміністратара каб даведацца які \n"
 "порт выкарыстоўвае ваш паслужнік."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr "Гэтая можнасьць кантралюе працягласьць пошуку."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Вы_карыстоўваць SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Выкарыстоўваць удакладнёнаю назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Выкарыстоўваць паштовую адрэсу"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Калі магчыма"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -753,60 +792,48 @@ msgstr ""
 "Калі ласка, запытайцеся, вашага сыстэмнага адміністратара, калі вы няпэўныя "
 "у гэтых зьвестках."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Назва для адлюстраваньня:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_Рэдагаваньне"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Мэтад уваходу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Нумар порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Назва паслужніка:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Таймаут (хвіліны):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "карткі"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "закладка далучэньня"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "агульная закладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "закладка пошуку"
 
@@ -838,7 +865,7 @@ msgid "Send HTML Mail?"
 msgstr "Даслаць ліст у фармаце HTML?"
 
 #: 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 "Дадаць да кантактаў"
 
@@ -854,7 +881,7 @@ msgstr "Імя"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Крыніца"
 
@@ -929,7 +956,8 @@ msgstr "Супрацоўніцтва"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Рэдактар кантактаў"
 
@@ -938,7 +966,7 @@ msgid "D_epartment:"
 msgstr "Па_дразьдзяленьне:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэталі"
@@ -1026,16 +1054,27 @@ msgstr "_Катэгорыі..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "Вы_даліць"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Рэдагаваньне"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "Хатні:"
@@ -1077,22 +1116,22 @@ msgid "_Web page address:"
 msgstr "Адрэса Web-старонкі:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Адрэса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Можа рэдагавацца"
 
@@ -2084,9 +2123,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 #, fuzzy
 msgid "Jabber"
 msgstr "Сьпіс бяз назвы"
@@ -2101,21 +2140,22 @@ msgid "MSN Messenger"
 msgstr "_Паштовае паведамленьне"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Паслуга гатова"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Мейсца:"
@@ -2126,115 +2166,99 @@ msgid "Username"
 msgstr "_Імя карыстальніка:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Хатні"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Праца"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Іншы"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Крыніца"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новы кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Палі у якія можна пісаць"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Зьменена"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Назва уліковага запіса"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Адсутнічае катэгорыя рэдактара."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Гэты кантакт належыць наступным катэгорыям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Захаваць кантакт як візытоўку (VCard)"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Вы ўпэўненыя што жадаеце\n"
-"выдаліць гэтыя кантакты?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы ўпэўненыя што жадаеце\n"
-"выдаліць гэты кантакт?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Працоўны"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "Ёра"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Група"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Неатрымалася адшукаць віджэт для поля: \"%s\""
@@ -2248,6 +2272,7 @@ msgid "_Edit Full"
 msgstr "Рэдагаваньне поўнага імя"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "Поўнае імя:"
 
@@ -2255,6 +2280,22 @@ msgstr "Поўнае імя:"
 msgid "E-_mail:"
 msgstr "Э. пошта:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Вы ўпэўненыя што жадаеце\n"
+"выдаліць гэтыя кантакты?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Вы ўпэўненыя што жадаеце\n"
+"выдаліць гэты кантакт?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрэса _2:"
@@ -2358,24 +2399,28 @@ msgstr "_Пасада:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Назва уліковага запіса"
+msgid "Add IM Account"
+msgstr "Уліковыя запісы пошты"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Уліковыя запісы пошты"
+msgid "_Account name:"
+msgstr "Назва уліковага запіса"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Паслуга гатова"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Мейсца:"
 
+#: 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 "Удзельнікі"
@@ -2396,25 +2441,26 @@ msgstr "Пазначце э. пошту ці перацягніце кантак
 msgid "contact-list-editor"
 msgstr "рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "Кніга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "Гэта новы сьпіс"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr "Рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "Захаваць сьпіс як Візытоўку (VCard)"
 
@@ -2467,24 +2513,21 @@ msgid "No contacts"
 msgstr "Паказаць кантакты"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Кантакт"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Кантакты"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Кантакты"
+msgstr[1] "Кантакты"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "Запыт"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Памылка атрыманьня прагляду кнігі"
 
@@ -2496,133 +2539,132 @@ msgstr "Мадэля"
 msgid "Error modifying card"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Назва пачынаецца з"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Э. пошта пачынаецца з"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Катэгорыя"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле ўтрымлівае"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "Адмысловае..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тып"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Кніга адрэсаў"
 
-#: 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 "Захаваць як візытоўку (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Новы кантакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Новы сьпіс кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Пераход у тэчку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Імпарт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Пошук кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Крыніцы кнігі адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Усталёўкі \"Пілёта\"..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Пераслаць кантакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Друк"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Друкаваць паштоўку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Кніга адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Кніга адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Выразаць"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Капіяваць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Уставіць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Бягучы выгляд"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2635,7 +2677,7 @@ msgstr ""
 "гэта нанава"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Любая катэгорыя"
@@ -2669,8 +2711,6 @@ msgid "Car Phone"
 msgstr "Тэлефон у аўтамабіле"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Катэгорыі"
 
@@ -2679,7 +2719,7 @@ msgid "Company Phone"
 msgstr "Тэлефон установы"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Э. пошта"
 
@@ -2733,6 +2773,7 @@ msgid "Manager"
 msgstr "Мэнаджар"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Мабільны тэлефон"
 
@@ -2741,7 +2782,7 @@ msgid "Nickname"
 msgstr "Мянушка"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Заўвага"
 
@@ -2750,7 +2791,7 @@ msgid "Office"
 msgstr "Офіс"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Установа"
 
@@ -2808,17 +2849,17 @@ msgid "Web Site"
 msgstr "І-нэт пляцоўка"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr "Шырыня"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr "Вышыня"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr "Мае засяроджаньне"
 
@@ -2870,92 +2911,95 @@ msgstr ""
 msgid "Adapter"
 msgstr "Адаптар"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Вылучаны"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Мае курсор"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Удзельнікі"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "Э. пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Праца"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Бостан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Група"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Пэрсанальнае"
+msgid "work"
+msgstr "Праца"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "Більбао"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Пэрсанальнае"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "Паса_да:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Хатні факс"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Пасьпяхова"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2963,98 +3007,98 @@ msgstr "Пасьпяхова"
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Сховішча знаходзіцца ў адлучаным стане"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картка ня адшукана"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Пратакол не падтрымліваецца"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Адменена"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Збой аўтарызацыі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Патрабуе аўтарызацыю"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS адсутнічае"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Кніга адрэсаў адсутнічае"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Іншая памылка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Жадаеце захаваць зьмены?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Адмовіць"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Памылка пад час даданьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Памылка пад час даданьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Памылка рэдагаваньня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Памылка выдаленьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Памылка выдаленьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3063,7 +3107,7 @@ msgstr ""
 "Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
 "Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3072,54 +3116,54 @@ msgstr ""
 "%s ужо існуе\n"
 "Жадаеце перапісаць?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Перапісаць"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Памылка захаваньня %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 "сьпіс"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перамясьсціць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Капіяваць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перамясьсціць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Капіяваць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Выбар кантактаў з кнігі адрэсаў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Шматлікія VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -3156,36 +3200,33 @@ msgstr "Дадаць адрэсу да кантакта \"%s\", які ўжо і
 msgid "Querying Address Book..."
 msgstr "Запыт да кнігі адрэсаў..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Рэдагаваньне кантактных зьвестак"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Аб'яднаць адрэсы Э. пошты"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "і %d іншых картак."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "і адна іншая картка."
+msgid_plural "and %d other contacts."
+msgstr[0] "і адна іншая картка."
+msgstr[1] "і адна іншая картка."
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Паказаць усе загалоўкі"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Захаваць кантакт як візытоўку (VCard)"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Захаваць у кнізе адрэсаў"
 
@@ -3335,7 +3376,7 @@ msgstr "Палі"
 msgid "Number of columns:"
 msgstr "Колькасьць слупкоў:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Парамэтры"
 
@@ -3519,7 +3560,7 @@ msgid "Unnamed List"
 msgstr "Сьпіс бяз назвы"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Пазначце пароль"
@@ -3600,7 +3641,7 @@ msgid "Evolution's Tasks component"
 msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
 
 #: 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"
@@ -3646,24 +3687,24 @@ msgstr "Нагадаць пасьля (хвіліны)"
 msgid "_Edit appointment"
 msgstr "_Рэдагаваць сустрэчу"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Адкрыць"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Апісаньне недаступна."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3672,12 +3713,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Папярэджаьне"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3689,7 +3730,7 @@ msgstr ""
 "\"Эвалюцыя\" будзе адлюстроўваць замест гэтага звычайны дыялёг\n"
 "нагадваньня."
 
-#: 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 "
@@ -3705,7 +3746,7 @@ msgstr ""
 "\n"
 "Вы сапраўды жадаеце выканаць гэтую праграму?"
 
-#: 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 "Болей не распавядаць мне пра гэтую праграму."
 
@@ -3879,13 +3920,13 @@ msgstr "Камэнтар утрымлівае"
 msgid "Location contains"
 msgstr "Апісаньне ўтрымлівае"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Іншая пошта"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Каляндар"
 
@@ -3907,7 +3948,7 @@ msgid "Purge events older than"
 msgstr "вяртае менш за"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "дні"
 
@@ -3918,7 +3959,7 @@ 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.
 #: 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"
 
@@ -3940,77 +3981,77 @@ 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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Новая сустрэча"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Сустрэча"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "Нарада"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Стварыць запыт новае нарады"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Новая сустрэча на увесь дзень"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Сустрэча на увесь _дзень"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "Ка_ляндар:"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Стварыць новую тэчку"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4040,11 +4081,6 @@ msgstr "Прагляд тыдню"
 msgid "Month View"
 msgstr "Прагляд месяцу"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Прагляд карыстальніка"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Памылка пад час адкрыцьця каляндара"
@@ -4062,16 +4098,16 @@ msgstr "Адсутнічаюць правы на адкрыцьцё калянд
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Немагчыма адчыніць тэчку у '%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Тып прагляду"
 
@@ -4137,11 +4173,11 @@ msgstr "дыялёг1"
 msgid "extra times every"
 msgstr "дадатковы час кожныя"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "гадзіны"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "хвіліны"
 
@@ -4164,11 +4200,11 @@ msgstr "Асноўнае"
 msgid "Date/Time:"
 msgstr "Дата/Час:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "Адлюстраваць паведамленьне"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Граць гук"
 
@@ -4177,17 +4213,17 @@ msgstr "Граць гук"
 msgid "Reminders"
 msgstr "Нагадваньне"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Запусьціць праграму"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Даслаць пошту"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "Агульныя зьвесткі:"
@@ -4218,7 +4254,7 @@ msgid "hour(s)"
 msgstr "гадзіна (ы)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "хвіліна(ы)"
 
@@ -4228,8 +4264,8 @@ msgstr "пачатак сустрэчы"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr "Уключана"
 
@@ -4245,19 +4281,19 @@ msgstr "Не імпартаваць"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "Выключыць"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr "Уключыць"
 
@@ -4281,7 +4317,7 @@ msgstr "30 хвілін"
 msgid "60 minutes"
 msgstr "60 хвілін"
 
-#: 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 "Сыгналы"
 
@@ -4306,7 +4342,7 @@ msgid "Days"
 msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Уключыць"
 
@@ -4402,7 +4438,7 @@ msgid "Wednesday"
 msgstr "Серада"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Працоўны тыдзень"
 
@@ -4449,7 +4485,6 @@ msgid "_Fri"
 msgstr "_Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Асноўнае"
 
@@ -4553,7 +4588,7 @@ msgstr ""
 "пазначаныя тутака."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Зьпіс заданьняў"
@@ -4722,28 +4757,28 @@ msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абн
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Памылка зацьверджаньня: %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 " да "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Выканана "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Выканана "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Патрэба "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Умоўленае"
 
@@ -4779,8 +4814,9 @@ msgstr "Запіс часопіса - %s"
 msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Захаваць як..."
 
@@ -4795,35 +4831,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Немагчыма атрымаць бягучую вэрсыю!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Адменена апэрацыі"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Каляндар"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Зьпіс заданьняў"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4852,19 +4873,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса бяз назвы?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
+#, 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] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
+msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
+#: 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] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
+msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
+#: 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] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
+msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4930,7 +4957,7 @@ msgstr "Дэлегаваць да:"
 msgid "Enter Delegate"
 msgstr "Пазначце дэлегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Сустрэча"
 
@@ -5003,8 +5030,6 @@ msgstr "Ка_ляндар:"
 
 #: 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 "Клясыфікацыя"
 
@@ -5059,13 +5084,13 @@ msgstr "_Час пачатку:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Няма"
 
@@ -5122,13 +5147,13 @@ msgid "Member"
 msgstr "Удзельнік"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "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
@@ -5316,7 +5341,7 @@ msgid "_No recurrence"
 msgstr "_Бяз вяртаньня"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr "_Выдаліць"
 
@@ -5358,7 +5383,7 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: 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 "_Адкінуць зьмены"
 
@@ -5366,6 +5391,28 @@ msgstr "_Адкінуць зьмены"
 msgid "Save Event"
 msgstr "Захаваць падзею"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Выбраць імпарт"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Каляндар"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Зьпіс заданьняў"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Зьвесткі па нарадзе створаны. Даслаць?"
@@ -5395,39 +5442,39 @@ msgstr "% Завершана"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Выканана"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr "Высокі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Выконваецца"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "Нізкі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Нармальны"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Не распачаты"
 
@@ -5443,7 +5490,7 @@ msgstr "Нявызначаны"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Дата заканчэньня:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5487,9 +5534,9 @@ msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 msgid "Con_fidential"
 msgstr "_Сакрэтна"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Апісаньне:"
 
@@ -5499,11 +5546,13 @@ msgid "Folder:"
 msgstr "_Тэчка:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Дата пачатку:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Умоўленая дата:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5563,138 +5612,112 @@ msgid "Weekly"
 msgstr "Тыдзень"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d дні"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 дзень"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d тыдні"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 тыдзень"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d гадзіны"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 гадзіна"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d хвіліны"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d дні"
+msgstr[1] "%d дні"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 хвіліна"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d тыдні"
+msgstr[1] "%d тыдні"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d сэкунды"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d гадзіны"
+msgstr[1] "%d гадзіны"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 сэкунда"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d хвіліны"
+msgstr[1] "%d хвіліны"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Даслаць пошту"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d сэкунды"
+msgstr[1] "%d сэкунды"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Невядомае дзеяньне для выкананьня"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s да пачатку сустрэчы"
 
-#: 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 пасьля пачатку сустрэчы"
 
-#: 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 у пачатку сустрэчы"
 
-#: 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 перад заканчэньнем сустрэчы"
 
-#: 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 пасьля заканчэньня сустрэчы"
 
-#: 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 на прыканцы сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %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 для невядомага тыпу трэггера"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Публічнае"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Прыватнае"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Сакрэтнае"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Апісаньне:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Дата завяршэньня"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Дата пачатку"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Агульныя зьвесткі"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "колер"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Сустрэча"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Вольны"
@@ -5730,141 +5753,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 "Так"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Не"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "Невядома"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Паўтор"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Прызначана"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Выдаленьне вылучаных аб'ектаў"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Абнаўленьне аб'ектаў"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Новая _сустрэча..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Новая падзея на ўвесь дзень"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Новая нарада"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Новае заданьне"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Друкаваць..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Уставіць"
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Перайсьці да _сёньня"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "Пера_йсьці да даты..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Адкрыць"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Захаваць _як..."
-
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Вы_разаць"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Капіяваць"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Заплянаваць нараду..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Перадаслаць як iCalendar..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Выдаліць гэтую зьяву"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Выдаліць _усе зьявы"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Усталёўкі..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5909,33 +5830,86 @@ 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 "Выдаленьне вылучаных аб'ектаў"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Абнаўленьне аб'ектаў"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Адкрыць"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Адкрыць паведамленьне"
 
-#: 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 "Захаваць _як..."
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "_Друкаваць..."
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Вы_разаць"
+
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "_Капіяваць"
+
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "_Уставіць"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Прызначыць заданьне"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Перадаслаць як iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "Пазначыць як выкананае"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Пазначыць вылучаныя заданьні як выкананыя"
 
-#: 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 "Выдаліць вылучаныя заданьні"
 
-#: 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 "Клікніце каб дадаць заданьне"
 
@@ -5944,38 +5918,101 @@ msgstr "Клікніце каб дадаць заданьне"
 msgid "% Complete"
 msgstr "% Завершана"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Сыгналы"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Выкананьне"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Дата выкананьня"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Умоўленая дата"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Геаграфічнае разьмяшчэньне"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Прыярытэт"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Дата пачатку"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Сартаваньне заданьняў"
 
-#: 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 "Новая _сустрэча..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Новая падзея на ўвесь дзень"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Новая нарада"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Новае заданьне"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Вылучыць абмеркаваньне тэмы"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Выдаліць..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Капіяваць у тэчку..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Перамясьціць у тэчку..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Заплянаваць нараду..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Перадаслаць як iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Выдаліць гэтую зьяву"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Выдаліць _усе зьявы"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Перайсьці да _сёньня"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "Пера_йсьці да даты..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Усталёўкі..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6007,26 +6044,26 @@ msgstr "дзяленьні %02i хвіліны"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -6035,106 +6072,98 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Так (Комплекснае вяртаньне)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Штодзённа"
+msgid_plural "Every %d days"
+msgstr[0] "Штодзённа"
+msgstr[1] "Штодзённа"
 
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Кожныя %d дзён"
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Штотыдзень"
+msgid_plural "Every %d weeks"
+msgstr[0] "Штотыдзень"
+msgstr[1] "Штотыдзень"
 
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Кожныя %d тыдні"
-
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Штотыдзень на "
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Кожныя %d тыдні на"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Штотыдзень на "
+msgstr[1] "Штотыдзень на "
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " і "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s дзень "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "штомесяц"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "кожныя %d мясацаў"
+msgid_plural "every %d months"
+msgstr[0] "штомесяц"
+msgstr[1] "штомесяц"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Штогод"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Кожныя %d год"
+msgid_plural "Every %d years"
+msgstr[0] "Штогод"
+msgstr[1] "Штогод"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " агулам з %d часа"
+#: 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] " агулам з %d часа"
+msgstr[1] " агулам з %d часа"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", сканчаецца на "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Пачынаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Сканчаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b> Выканана</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Умоўлена:</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"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "Памылка iCalendar"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Невядомая пэрсона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6142,310 +6171,314 @@ msgstr ""
 "<br>Калі ласка, прагледзьце наступную інфармацыю, і выбярыце дзеяньне з мэню "
 "ніжэй."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Няма</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Мейсца:"
+
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прынята"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Прынята для спробы"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Адхілена"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Выбраць дзеяньне:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Абнавіць"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Так"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Прыняць"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Прыняць для спробы"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Адхіліць"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Даслаць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Абнавіць стан удзельнікаў"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Даслаць апошнюю інфармацыю"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Адмяніць"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> разьмясьціў(ла) зьвесткі аб нарадзе."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Зьвесткі аб нарадзе"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запытваецца прысутнасьці %s на нарадзе."
 
-#: 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> запытваецца вашае прысутнасьці на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Плян нарады"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жадае далучыць да распачатае нарады."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> запытвае апошнюю інфармацыю па нарадзе."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Запыт на абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> мае адказ на запыт нарады."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Адказ па нарадзе"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> мае адмяніць нараду."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Адмена нарады"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> мае даслаць неінтэлегентнае паведамленьне."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Дрэннае паведамленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> мае апублікаваць зьвесткі аб заданьні."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Інфармацыя аб заданьні"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пытаецца %s аб выкананьні заданьня."
 
-#: 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> пытаецца вас аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Плян заданьня"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> жадае дадаць да распачатага заданьня."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жадае атрымаць апошнія зьвесткі па заданьні."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Запыт на абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> мае адказ на заданьне."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Адказ на заданьне"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> мае адмяніць заданьне."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Адмена заданьня"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Дрэннае паведамленьне па заданьні"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> мае апублікаваць інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Інфармацыя \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> патрабуе ад вас інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Запыт \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> мае адказаць на запыт аб інфармацыі \"Заняты/Вольны\"."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Адказ на \"Заняты/Вольны\""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Дрэннае паведамленьне \"Вольны /Заняты\""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "Падобна што паведамленьне не было правільна сфармавана"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Паведамленьне утрымлівае толькі запыты, якія не падтрымліваюцца."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Укладаньне ня ўтрымлівае рэчаіснага паведамленьня каляндара"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Укладаньне мае элемэнты каляндара, якія нельга адлюстраваць"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Файл каляндара ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Абнаўленьне завершана\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 "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
 
-#: 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 "Аб'ект нерэчаісны і ня будзе абноўлены\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 "Адказ не ад бягучага удзельніка. Дадаць як ад яго?"
 
-#: 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 "Стан удзельніка ня можа быць абноўлены, таму што ён нерэчаісны!\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 "Адбылася памылка ў сыстэме CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Аб'ект адсутнічае\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 "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Стан удзельніка абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Выдаленьне скончана"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "Элемэнт дасланы!\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 "Элемэнт ня можа быць дасланы!\n"
 
@@ -6580,7 +6613,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6666,12 +6699,12 @@ msgstr "_Прыярытэт:"
 msgid "Web Page:"
 msgstr "Старонка"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Клікніце каб дадаць заданьне"
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6681,7 +6714,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"
@@ -6689,12 +6722,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Адкрыцьцё заданьняў %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6703,47 +6736,49 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Загрузка відарысаў"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Сустрэчы не заплянаваны."
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Загрузка відарысаў"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Адкрыць у %s..."
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Турэцкае"
@@ -6765,45 +6800,46 @@ msgid "February"
 msgstr "Люты"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Перайсьці да даты"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Студзень"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Ліпень"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Чэрвень"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Сакавік"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Травень"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Лістапад"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Кастрычнік"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Выбар імёнаў"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Верасень"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Перайсьці да сёньня"
+msgid "_Select Today"
+msgstr "Выбраць тэчку"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6885,7 +6921,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7042,81 +7078,81 @@ msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Вылучаны дзень (%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 "Вылучаны тыдзень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Вылучаны месяц (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Вылучаны год (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Заданьне"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Прыярытэт: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Адсоткі выкананьня: %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 "Катэгорыі: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Кантакты: "
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Друк элемэнта"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Наладка друку"
 
@@ -7125,39 +7161,39 @@ msgstr "Наладка друку"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Заданьне"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8801,7 +8837,7 @@ msgstr "Неатрымалася стварыць шлях для кэшу"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Неатрымалася выдаліць кэшаваны элемэнт: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8812,7 +8848,7 @@ msgstr ""
 "Далейшыя апэрацыі ня будуць запісаны й, адпаведна, ня будуць\n"
 "адноўленыя пасьля далучэньня да паслужніка."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8823,7 +8859,7 @@ msgstr ""
 "%s\n"
 "Зьмены, зробленыя у гэтае тэчцы, ня будуць сынхранізаваныя."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Перасынхранізацыя з паслужнікам"
 
@@ -8840,7 +8876,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "Падрыхтоўка тэчкі \"%s\" для аўтаномнае працы"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Вы мусіце працаваць у далучаным стане для завяршэньня гэтае апэрацыі"
 
@@ -8955,31 +8991,35 @@ msgstr "(супадае ўсе) патрабуе адзінага лягічна
 msgid "Performing query on unknown header: %s"
 msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Апэрацыя не падтрымліваецца: пошук па ідэнтыфікатары карыстальніка: для %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Перамяшчэньне паведамленьняў"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Капіяваньне паведамленьняў"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
@@ -9014,7 +9054,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 "Адменена."
 
@@ -9399,7 +9440,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
 
@@ -9604,7 +9645,7 @@ msgstr "Памылка разбору"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Неатрымалася атрымаць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
@@ -9613,21 +9654,22 @@ msgstr "Неатрымалася атрымаць тэчку: недапушча
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Неатрымалася стварыць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Сьметніца"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Чэрвень"
@@ -9859,17 +9901,17 @@ msgstr "Паведамленьне %s адсутнічае ў %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
@@ -9907,33 +9949,32 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr "Аўтаматычна правяраць пошту кожныя"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Назва паслужніка"
+msgid "Address Book And Calendar"
+msgstr "Кніга адрэсаў"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_База пошуку:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9941,8 +9982,8 @@ msgstr ""
 "Далучэньне да IMAP паслужніка будзе адбывацца з выкарыстаньнем "
 "незашыфраванага пароля."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Густая дымка"
@@ -9950,12 +9991,12 @@ msgstr "Густая дымка"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Дзеяньне адмененае"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Паслужнік нечакана адключыўся: %s"
@@ -10013,12 +10054,12 @@ msgstr "Тэчка была зьнішчана і нанава створана
 msgid "Scanning for changed messages"
 msgstr "Сканаваньне зьмененых паведамленьняў"
 
-#: 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 "Немагчыма арымаць паведамленьне: %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
@@ -10034,25 +10075,25 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Няма гэткага паведамленьня"
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Гэтае паведамленьне ў бягучы момант недаступна"
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Атрыманьне агульнае інфармацыі для новых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "Немагчыма адшукаць цела паведамленьня ў адказе FETCH."
 
@@ -10130,18 +10171,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Паслужнік IMAP %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 для %s на %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
@@ -10151,15 +10192,15 @@ msgstr "паслуга IMAP для %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Немагчыма далучыцца да %s (порт %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
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "TLS адсутнічае"
 
-#: 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
@@ -10167,49 +10208,49 @@ msgstr "TLS адсутнічае"
 msgid "Connection cancelled"
 msgstr "Далучэньне адмененае"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %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 не падтрымліваецца."
 
-#: 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"
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Паслужнік IMAP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ідэнтыфікацыя тыпа %s не падтрымліваецца"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sКалі ласка, увядзіце пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Вы не пазначылі пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10220,32 +10261,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Тэчка %s адсутнічае "
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%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:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невядомая бацькоўская тэчка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Гэтая тэчка ня можа утрымліваць падтэчкі"
 
@@ -10278,20 +10320,20 @@ msgid "Index message body data"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%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 "паштовая скрыня:%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)"
@@ -10347,7 +10389,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"
@@ -10396,8 +10438,8 @@ msgstr "Неатрымалася выдаліць выніковы файл тэ
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Неатрымалася выдаліць індэксны файл тэчкі \"%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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Неатрымалася выдаліць выніковы файл тэчкі \"%s\": %s"
@@ -10427,14 +10469,14 @@ msgstr "Нерэчаісны зьмест паведамленьня"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Тэчка \"%s\" не існуе."
@@ -10453,7 +10495,7 @@ msgstr "\"%s\" не зьяўляецца паштовым каталёгам."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -10464,28 +10506,28 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "не зьяўляецца паштовым каталёгам"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Немагчыма сканаваць тэчку `%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 "Неатрымліваецца адкрыць шлях да тэчкі паштовага каталёга: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Праверка напаўненьня каталёгаў"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Праверыць наяўнасьць новых паведамленьняў"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10533,7 +10575,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збой у канструкцыі паведамленьня: паштовая скрыня пашкоджана?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Немагчыма стварыць тэчку з гэткай назвай"
@@ -10564,32 +10606,32 @@ msgstr "%s не зьяўляецца звычайным файлам."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тэчка \"%s\" не пустая. Не выдалена."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Пазначаная назва тэчкі недапушчальна: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Немагчыма зьмяніць назву '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
@@ -10633,7 +10675,7 @@ msgstr "Немагчыма закрыць тэчку крыніцы %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Немагчыма закрыць часовую тэчку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s"
@@ -10676,14 +10718,14 @@ msgstr "Даданьне паведамленьня да тэчкі MH адме�
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Неатрымалася стварыць тэчку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
@@ -10969,47 +11011,47 @@ msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Невядомая памылка: %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 "Не адшукана тэчка: %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 "Немагчыма атрымаць групу: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Неатрымалася даслаць паведамленьне: %s"
 
-#: 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: %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: Сканаваннье новых паведамленьняў"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Невядомы адказ паслужніка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Адмяніце"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збой апэрацыі: %s"
@@ -11056,7 +11098,7 @@ msgstr "Выдаляць праз %s дзён"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11146,7 +11188,7 @@ msgid "No such folder `%s'."
 msgstr "Няма гэткае тэчкі \"%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"
 
@@ -11200,12 +11242,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Дастаўка пошты праз праграму sendmail"
 
-#: 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 ""
 "Для дастаўкі пошты з дапамогай далучэньня да аддаленага паштовага вузла па "
 "пратаколе SMTP.\n"
@@ -11326,13 +11369,14 @@ msgid "server does not appear to support SSL"
 msgstr "здаецца, паслужнік не падтрымлівае SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "Перавышаны час чаканьня адказу на запыт STARTTLS: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "Збой каманды IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "Памылка пад час адказу на STARTTLS"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "Збой каманды IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11366,156 +11410,159 @@ msgid "SMTP mail delivery via %s"
 msgstr "Дастаўка пошты SMTP праз %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Немагчыма даслаць паведамленьне: ня пазначаны атрымоўцы."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Немагчыма даслаць паведамленьне: памылковая адрэса адпраўляльніка."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Адпраўка паведамленьня"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Немагчыма даслаць паведамленьне: ня пазначаны атрымоўцы."
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Неатрымліваецца даслаць паведамленьне: пазначаны адзін ці некалькі "
 "некарэктных атрымоўцаў"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "Вітаньне SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "Перавышаны час чаканьня адказу на запыт HELO: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "Памылка адказу на HELO"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "Аўтарызацыя SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Памылка стварэньня аб'екта аўтарызацыі SASL"
 
-#: 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: %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: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "Памылка запыту AUTH."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "Збой каманды IMAP: %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 "Адмоўны адказ ідэнтыфікацыі ад паслужніка.\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: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "Памылка адказу на MAIL FROM"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "Збой каманды IMAP: %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: %s: пошта не даслана"
 
-#: 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> ня атрымалася"
 
-#: 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: %s: пошта не даслана"
 
 #. 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"
-
-#: 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: паведамленьне перарвана: %s: пошта не даслана"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "Збой адказу пад час перарываньня DATA"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "Збой каманды IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Перавышаны час чаканьня адказу на RSET: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "Памылка адказу на RSET"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "Перавышаны час чаканьня адказу на запыт QUIT: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "Памылка адказу на QUIT"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "Збой каманды IMAP: %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 "укладаньне"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr "Выдаліць выбраныя элемэнты са сьпіса укладаньняў"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Дадаць укладаньне..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Укласьці файл у паведамленьне"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Немагчыма ўкласьці файл %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 "Немагчыма укласьці файл %s: не зьяўляецца сталым файлам"
@@ -11537,23 +11584,23 @@ msgstr "Тып MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Прапаноўваць аўтаматычнае адлюстраваньне укладаньня"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Вы мусіце наладзіць уліковы запіс\n"
 "да таго як стварыць паведамленьне."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Мейсца прызначэньня"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Укласьці файл у паведамленьне"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Клікніце тутака для выкліку кнігі адрэсаў"
 
@@ -11564,45 +11611,45 @@ msgstr "Клікніце тутака для выкліку кнігі адрэ�
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Адказаць на:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Ад каго:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Каму:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Пазначце атрымоўцаў паведамленьня"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Копія:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Пазначце атрымоўцаў, якія атрымаюць копію паведамленьня"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Сх. копія:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11613,11 +11660,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Даслаць на:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<клікніце тутака для выбару тэчкі>"
@@ -11626,20 +11673,20 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Attach file(s)"
 msgstr "Укласьці файл(ы)"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11648,30 +11695,30 @@ msgstr ""
 "Памылка пад час чытаньня файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Файл існуе, перапісаць?"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Памылка захаваньня файла: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Памылка пад час загрузкі файла: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Памылка доступу да файла: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11680,7 +11727,7 @@ msgstr ""
 "Немагчыма зрушыць па файле: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11689,7 +11736,7 @@ msgstr ""
 "Немагчыма усекчы файл: %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"
@@ -11698,7 +11745,7 @@ msgstr ""
 "Немагчыма скапіяваць дэскрыптар файла: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11707,7 +11754,7 @@ msgstr ""
 "Памылка аўтазахаваньня паведамленьня: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11716,7 +11763,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала незахаваныя файлы з папярэдняга сэанса.\n"
 "Жадаеце пспрабаваць аднавіць іх?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11728,42 +11775,47 @@ msgstr ""
 "Жадаеце захаваць зьмены?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Паведамленьне бяз назвы)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Увага: Зьмененае паведамленьне"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Адкрыцьцё файла"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Подпіс:"
-
-#: 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 "Створана аўтаматычна"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Подпіс:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Стварыць паведамленьне"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11771,7 +11823,7 @@ msgstr ""
 "Немагчыма стварыць акно рэдактара.\n"
 "Немагчыма актывізаваць кіраваньне выбарам адрэсы."
 
-#: 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"
@@ -11783,7 +11835,7 @@ msgstr ""
 "Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
 "gtkhtml і libgtkhtml.\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."
@@ -11791,7 +11843,7 @@ msgstr ""
 "Неатрымалася стварыць акно рэдактара:\n"
 "Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11915,7 +11967,7 @@ msgstr ""
 "Калі вы атрымалі паведамленьне з падцьверджаньнем прачытаньня вашага ліста, "
 "што мусіць рабіць \"Эвалюцыя\"?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11923,15 +11975,15 @@ msgstr ""
 "Файл з гэтай назвай ужо існуе.\n"
 "Перапісаць?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Перапісаць файл?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Запомніць гэты пароль"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Запомніць гэты пароль да заканчэньня сэанса"
 
@@ -12014,13 +12066,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12029,118 +12081,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 сэкунда таму"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 сэкунда таму"
+msgstr[1] "1 сэкунда таму"
 
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d сэкунды таму"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 хвіліна таму"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 хвіліна таму"
+msgstr[1] "1 хвіліна таму"
 
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d хвіліны таму"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 гадзіна таму"
+msgid_plural "%d hours ago"
+msgstr[0] "1 гадзіна таму"
+msgstr[1] "1 гадзіна таму"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d гадзіны таму"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 дзень таму"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d дзён таму"
+msgid_plural "%d days ago"
+msgstr[0] "1 дзень таму"
+msgstr[1] "1 дзень таму"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 тыдзень таму"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d тыдні таму"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 тыдзень таму"
+msgstr[1] "1 тыдзень таму"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 месяц таму"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d месяцаў таму"
+msgid_plural "%d months ago"
+msgstr[0] "1 месяц таму"
+msgstr[1] "1 месяц таму"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 год таму"
+msgid_plural "%d years ago"
+msgstr[0] "1 год таму"
+msgstr[1] "1 год таму"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d гады таму"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Вы мусіце пазначыць дату."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<клікніце тутака для выбару даты>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "зараз"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 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 "Выбраць час для параўнаньня"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Правілы філтра"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Вы мусіце пазначыць назву файла."
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Выбар файла"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Тады"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Умоўлена:</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Вы мусіце пазначыць тэчку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
 
@@ -12154,23 +12194,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 "Важнае"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Трэба выканаць"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Пазьней"
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Тэст"
 
@@ -12178,59 +12218,64 @@ msgstr "Тэст"
 msgid "You must name this filter."
 msgstr "Вы мусіце назваць фільтар."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Назва правіла: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Бяз назвы"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Калі"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Умоўлена:</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Выканаць дзеяньні"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "калі адпавядае ўсім крытэрам"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "калі задавальняе па любому з крытэраў"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "атрыманае"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "дасланае"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Параўнаць з"
+#, fuzzy
+msgid "    "
+msgstr "      "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Рэдагаваньне фільтраў"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правілы філтра"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Рэдагаваньне віртуальных тэчак"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Крыніцы віртуальных тэчак"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Параўнаць з"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Атрыманыя"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Дасланыя"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12238,7 +12283,7 @@ msgstr ""
 "Дата паведамленьня будзе параўнана з\n"
 "12 гадзінамі пазначанай даты."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12247,7 +12292,7 @@ msgstr ""
 "Дата паведамленьня будзе параўнана з\n"
 "12 гадзінамі пазначанай даты."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12256,59 +12301,51 @@ msgstr ""
 "Дата паведамленьня будзе параўнана з\n"
 "12 гадзінамі пазначанай даты."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Віртуальныя тэчкі"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "час адносна бягучага"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "раней"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "сэкундаў"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "толькі пазначаныя тэчкі"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "бягучы час"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "пазначаны вамі час"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "Крыніцы віртуальных тэчак"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "тыдні"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "з усімі актыўнымі адаленымі тэчкамі"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "з усімі лакальнымі й актыўнымі аддаленымі течкамі"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "з усімі лакальнымі тэчкамі"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "гады"
 
@@ -12442,7 +12479,7 @@ msgstr "не пазначана"
 msgid "Junk Test"
 msgstr "Чэрвень"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Адмеціна"
@@ -12474,8 +12511,9 @@ msgid "Move to Folder"
 msgstr "Перамясьціць у тэчку"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Скіраваць паведамленьне у каманду абалонкі"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Выйсьці з праграмы"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12509,23 +12547,24 @@ msgstr "вяртае больш за"
 msgid "returns less than"
 msgstr "вяртае менш за"
 
-#: 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 "Запусьціць праграму:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Лік"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Адпраўляльнік"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Усталяваць стан"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Каманда абалонкі"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Памер (kB)"
@@ -12550,9 +12589,9 @@ msgstr "пачынаецца з"
 msgid "Stop Processing"
 msgstr "Спыніць апрацоўку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Тэма"
@@ -12561,17 +12600,13 @@ msgstr "Тэма"
 msgid "Unset Status"
 msgstr "Адмяніць папярэдні стан"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Пазва правіла '%s' ня ўнікальна, выбярыце іншую."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Правілы"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Дадаць правіла"
 
@@ -12583,8 +12618,9 @@ msgstr "Рэдагаваць правіла"
 msgid "Rule name"
 msgstr "Назва правіла"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Правіла падліку"
 
 #: filter/searchtypes.xml.h:1
@@ -12619,15 +12655,20 @@ msgstr "Тэма ўтрымлівае"
 msgid "Subject does not contain"
 msgstr "Тема ня ўтрымлівае"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Віртуальныя тэчкі"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Вы мусіце назваць гэтую віртуальную тэчку."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Вам трэба пазначыць хаця бы адну тэчку ў якасьці крыніцы."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "Крыніца віртуальнае тэчкі"
 
@@ -12679,8 +12720,8 @@ msgstr "Праглядальнік паштовае тэчкі \"Эвалюцы�
 msgid "Evolution Mail preferences control"
 msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Пошта"
@@ -12689,53 +12730,50 @@ msgstr "Пошта"
 msgid "Mail Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Перавагі пошты"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Вы упэўнены што жадаеце выдаліць гэты рахунак?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Не выдаляць"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Дапомна]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Назва уліковага запіса"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr "Бяз назвы"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Неабходна пазначыць правільную назву сцэнара."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[сцэнар]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Мова(ы)"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Дадаць подпіс сцэнара"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Дадаць подпіс"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Подпіс(ы)"
 
@@ -12787,7 +12825,7 @@ msgstr ""
 "Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
 "Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
 
@@ -12821,299 +12859,329 @@ msgstr "Наступнае нечытанае паведамленьне"
 msgid "<click here to select a folder>"
 msgstr "<клікніце тутака для выбару тэчкі>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Пазначце дзе стварыць тэчку:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Назва тэчкі:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Атрыманае"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Выдаленьне тэчкі %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Адкрыцьцё тэчкі \"%s\""
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Перамяшчэньне паведамленьняў у %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Капіяваньне паведамленьняў у %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Захаваньне тэчкі \"%s\""
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 "Немагчыма выдаліць тэчку \"%s\":\n"
 "%s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Сапраўды выдаліць тэчку \"%s\"?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Выдаліць \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Зьмяніць назву тэчкі \"%s\" на:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Зьмяніць назву тэчкі"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "Выгляд"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Адкрыць у новым акне"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Перамясьціць"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Новая тэчка..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "Зьмяніць _назву"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Уласьцівасьці..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Зьмяніць як новае паведамленьне..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Друк"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Адказаць у сьпіс"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Адказаць усім"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Перадаслаць"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Падняцца вышэй..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Выкананы сьцяг"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Ачысьціць сьцяг"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Пазначыць як чытанае"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Пазначыць як неважнае"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Вярнуць"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Капіяваць у тэчку..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "_Ужыць фільтары"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Правілы філтра"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "Стварыць правіла з паведамленьня"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "Віртуальная тэчка па тэме"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "Віртуальная тэчка па атрымоўцы"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "Віртуальная тэчка па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Фільтар па тэме"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Фільтар па адпраўляльніку"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Фільтар па атрымоўцы"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Фільтар па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Фільтар па адпраўляльніку"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Дапомна"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Друк паведамленьня"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скапіяваць спасылку"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клікніце каб дадаць заданьне"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Супадзеньні:"
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 #, fuzzy
 msgid "Unsigned"
 msgstr "Прызначана"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13122,12 +13190,12 @@ msgstr ""
 "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
 "тоеснасьць."
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 #, fuzzy
 msgid "Valid signature"
 msgstr "Рэдагаваць подпіс"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13136,101 +13204,101 @@ msgstr ""
 "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
 "тоеснасьць."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Рэдагаваць подпіс"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Перарвана"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "Кадаваньне PGP"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Сэртыфікат яшчэ не зацьверджаны"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Пратэрмінавана:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Убудаваны прагляд"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Схаваць"
@@ -13240,128 +13308,164 @@ msgstr "Схаваць"
 msgid "Page %d of %d"
 msgstr "Аркуш %d з %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
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Часка external-body памылкова сфармаваная"
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указальнік на FTP сайт (%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 "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указальнік на лакальны файл (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указальнік на аддаленыя даньні (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Перамяшчэньне паведамленьняў"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Ад каго"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Адказаць на"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Каму"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Копія"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Сх.копія"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Паштавік"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr "%s укладаньне"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Тэма не падтрымліваецца"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Немагчыма праверыць подпіс"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Немагчыма праверыць подпіс"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Штогод"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "Адзін дзень"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Адзін тыдзень"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Адзін меся_ц"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13370,22 +13474,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Збой у кэшы %s: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Збой у кэшы %s: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Збой пад час стварэньня канала да \"%s\": %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Збой вызначэньня вузла \"%s\": %s"
@@ -13428,34 +13532,34 @@ msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 msgid "Open in %s..."
 msgstr "Адкрыць у %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Падпісацца"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Тэчка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Калі ласка, выбярыце паслужнік."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Небыў выбраны паслужнік"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13464,27 +13568,27 @@ msgstr ""
 "Памылка пад час загрузкі інфармацыі фільтара:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Фільтары"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "невядомы адпраўляльнік"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
 
-#: 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"
@@ -13493,7 +13597,7 @@ msgstr ""
 "Немагчыма захаваць у `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13502,38 +13606,38 @@ msgstr ""
 "`%s' ужо існуе.\n"
 "Перазапісаць?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Паведамленьне"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Захаваць паведамлеьне як..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "Адрэса"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Ліст ад %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неатрымалася стварыць часовы каталёг: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13546,7 +13650,7 @@ msgstr ""
 "\n"
 "Сапраўды сьцёрці паведамленьні?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13626,173 +13730,195 @@ msgstr "Дапомная тэма паведамленьня."
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Дапомная тэма паведамленьня."
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "Стыль _адказа:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Схаваць панэлю лычак"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Схаваць панэлю лычак"
 
-#: 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 "Схаваць панэлю лычак"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Выканаць дзеяньні"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13801,104 +13927,116 @@ msgstr ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Даслаць ліст у фармаце HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Даслаць ліст у фармаце HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Паказаць паведамленьне ў звычайным стылі"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Акно перадпрагляду"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Граць файл, калі атрымана новая пошта"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Праверка правапіса"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "Тэрмінальны шрыфт:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
 
-#: 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;"
@@ -13906,113 +14044,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Зрабіць дапомным уліковым запісам"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "Пераменая шырыня:"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Імпарт"
@@ -14052,14 +14190,14 @@ msgstr "\"Эвалюцыя\" імпартуе вашую старую пошту
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Імпартаваньне..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Калі ласка, пачакайце"
 
@@ -14108,12 +14246,12 @@ msgstr "Імпартаваньне файлаў"
 msgid "Scanning %s"
 msgstr "Сканаваньне %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Прыярытэтны фільтар \"%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"
@@ -14128,7 +14266,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14136,7 +14274,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14145,24 +14283,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Усталёўкі"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Фільтары пошты"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14195,62 +14333,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Бягучы фармат захаваньня:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Цела індэкса утрымлівае"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Новы фармат захаваньня:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Увага: пад час канвэртаваньня між фарматамі паштовых скрыняў збой \n"
-"(як недахоп дыскавае прасторы) може ня быць аўтаматычна адноўлены\n"
-"Карыстайцеся гэтай магчымасьцю асьцярожна."
-
-#: 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 "Вы не пазначылі ўсё неабходную інфармацыю."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr "Рэдактар уліковага запіса \"Эвалюцыі\""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Вузел:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Імя карыстальніка:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Шлях:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Вы ня можаце стварыць два рахункі з аднолькавымі назвамі."
 
@@ -14283,11 +14387,11 @@ msgstr "Адказана на"
 msgid "Add Filter Rule"
 msgstr "Дадаць правіла фільтра"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Наступныя правілы фільтара(ў):\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14298,58 +14402,59 @@ msgstr ""
 "    '%s'\n"
 "І будзе абноўлена."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Маюцца недасланыя паведамленьні! Вы жадаеце завяршыць працу?"
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Новае паштовае паведамленьне"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Паштовае паведамленьне"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Скласьці новае паведамленьне"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Фільтары пошты"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "сапраўдны"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14358,15 +14463,15 @@ msgstr ""
 "Калі вы няпэўныя, запытайцеся вашага сыстэмнага адміністратара ці правайдэра "
 "паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Выбярыце адзін з наступных варыянтаў"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14374,11 +14479,11 @@ msgstr ""
 "Калі ласка, пазначце інфармацыю аб шляхах адпраўкі пошты. Калі вы няпэўныя, "
 "запытайцеся вашага сыстэмнага адміністратара ці правайдэра паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Кіраваньне рахункамі"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14387,125 +14492,259 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Праверка паслугі"
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr "Далучэньне да паслужніка..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr " Праверка тыпаў якія падтрымліваюцца "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Перадпрагляд"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL не падтрымліваецца ў гэтае зборцы \"Эвалюцыі\")"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL не падтрымліваецца ў гэтае зборцы \"Эвалюцыі\")"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Стан:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Стан:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "Заўсёды шыфраваць маім ключом пад час адпраўленьня паведамленьня"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Рэдактар уліковых запісаў"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Зьвесткі аб уліковым запісе"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Праверка новае пошты"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Дадаць _сцэнар"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Дадаць новы подпіс..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Заўсёды шыфраваць маім ключом пад час адпраўкі шыфраванае пошты"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Заўсёды дасылаць нябачную копію (Bcc) на:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Заўсёды дасылаць копію (Cc) на:"
+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
+#, fuzzy
+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 "Нагаданьне аб пошце"
+
+#: 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 "Дасланыя паведамленьні і чарнавікі"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "Заўсёды шыфраваць маім ключом пад час адпраўленьня паведамленьня"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Рэдактар уліковых запісаў"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Дадаць новы подпіс..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Дадаць _сцэнар"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Заўсёды шыфраваць маім ключом пад час адпраўкі шыфраванае пошты"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Заўсёды дасылаць копію (Cc) на:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Заўсёды дасылаць нябачную копію (Bcc) на:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr ""
+"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Заўсёды давяраць ключам у маім зборы ключоў пад час кадаваньня"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Укласьці арыгінальнае паведамленьне"
 
-#: 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 "Укладаньне"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Аўтарызацыя"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Аўтаматычна устаўляць відарысы \"усьмешак\""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Аўтаматычна правяраць пошту кожныя"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балцкая (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балцкая (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Гукавы сыгнал пад час атрыманьня новае пошты"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "Колеры"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " Праверка тыпаў якія падтрымліваюцца "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Праверка новае пошты"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Правяраць правапіс пад час уводу тэкста"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Праверка новае пошты"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Колер для памылковых словаў:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Стварэньне паведамленьняў"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "Колеры"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Канфігурацыя"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Запытвацца падцьверджаньня ачысткі тэчкі ад выдаленых паведамленьняў"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14521,288 +14760,272 @@ msgstr ""
 "\n"
 "Клікніце \"Ужыць\" каб захаваць вашыя усталёўкі."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Дапомна"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Дапомныя паводзіны"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Дапомнае кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Выдаленьне пошты"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr ""
-"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
+msgid "Defaults"
+msgstr "Дапомнае"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Не цытавацьь зыходнае паведамленьне"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не падпісываць запыты на нараду (для сумяшчальнасьці з Outlook)"
 
-#: 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 "Зроблена"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "Тэчка чарнавіка:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "Электроная адрэса пошты:"
 
-#: 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 "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Дапаможнік уліковага запісу \"Эвалюцыі\""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Выканаць каманду..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Фіксаваная шырыня:"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "<< Менш можнасьцяў"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Уласьцівасьці шрыфта"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Фарматаваць паведамленьні ў HTML"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "По_шта у HTML"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "Загаловак"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Вылучаць _цытаваньне:"
 
-#: 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 "убудаваны"
 
-#: 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 "Адмеціны і колеры"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Загрузка відарысаў"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Наладка пошты"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Разьмяшчэньне паштовае скрыні"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Рэдактар паведамленьняў"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Адлюстраваньне паведамленьняў"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Шрыфт паведамленьня"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Нагаданьне аб пошце"
-
-#: 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"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Дадатковая інфармацыя"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Установа:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "Ід ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Выбярыце колер"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "Граць файл, калі атрымана новая пошта"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: 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 "Шрыфты для друку"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Паштовы каталёг Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr "Цытаваць арыгінальнае паведамленьне"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Працытавана"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Адказаць на:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Парамэтры атрыманьня"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Неабходная інфармацыя"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Аднавіць дапомнае"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "Стандартны шрыфт:"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
 msgstr "Бясьпека"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Абараніць MIME (S/MIME)"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні для друку"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Выдаліць..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Тэчка дасланых паведамленьняў:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Дасланыя паведамленьні і чарнавікі"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Паслужнік патрабуе аўтарызацыю"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Наладка паслужніка"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Тып паслужніка: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Самападпісаны сэртыфікат у ланцужку"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Подпіс:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Подпісы"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Пазначце назву файла:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "_Праверка правапіса"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Стандартны файл Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "Тэрмінальны шрыфт:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Тып:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
@@ -14811,7 +15034,7 @@ msgstr ""
 "Гэтая старонка дазваляе наладзіць паводзіны праверкі правапіса і мову. Сіпіс "
 "моваў адлюстроўвае толькі мовы, слоўнікі якіх усталяваны ў вашае сыстэме."
 
-#: 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\""
@@ -14819,15 +15042,15 @@ msgstr ""
 "Пазначце назву для гэтага рахунка.\n"
 "Да прыкладу: \"Праца\" ці \"Асабістае\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Пераменая шырыня:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14837,182 +15060,113 @@ msgstr ""
 "\n"
 "Калі ласка, клікніце \"Наперад\" каб пачаць. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Дадаць подпіс"
 
-#: 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 "Заўсёды загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "Тып аўтарызацыі: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Тып аўтарызацыі: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Аўтаматычна правяраць пошту кожныя"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Аўтаматычна устаўляць відарысы \"усьмешак\""
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Гукавы сыгнал пад час атрыманьня новае пошты"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Запытвацца падцьверджаньня ачысткі тэчкі ад выдаленых паведамленьняў"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Дапомны подпіс:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "Дапомнае"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не паведамляць пра атрыманьне новай пошты"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "Стыль перасылкі:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "Поўнае імя:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "По_шта у HTML"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Тоеснасьць"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "Чэрвень"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Загрузіць відарысы, калі адпраўляльнік ёсьць у кнізе адрэсаў"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Зрабіць дапомным уліковым запісам"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "Паз_начаць паведамленьні як \"Прачытанае\" праз:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: 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 "Ніколі не загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "Граць файл, калі атрымана новая пошта"
-
-#: 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 ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Папярэджваць пад час адпраўкі паведамленьняў з пустой тэмай"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Атрыманьне пошты"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "Стыль _адказа:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Вярнуць дапомнасьці"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Сцэнар:"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Выдаліць..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "А_дпраўка пошты"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Подпісы"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "Стандартны шрыфт:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "Тэрмінальны шрыфт:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Выкарыстоўваць тойжа шрыфт што і аснатнія дастасаваньні"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "хвіліна(ы)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "колер"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "апісаньне"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15021,7 +15175,7 @@ msgstr ""
 "Памылка пад час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15030,7 +15184,7 @@ msgstr ""
 "Памылка пад час выкананьня апэрацыі:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Праца"
 
@@ -15038,132 +15192,131 @@ msgstr "Праца"
 msgid "Filtering Folder"
 msgstr "Фільтраваньне тэчкі"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Адпраўленьне \"%s\""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Збой на паведамленьні %d з %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Неатрымалася дэкадаваць паведамленьне."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Атрыманьне %d паведамленьняў"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Атрыманьне %d паведамленьняў"
+msgstr[1] "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Захаваньне %d паведамленьняў"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Захаваньне %d паведамленьняў"
+msgstr[1] "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15172,7 +15325,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15181,11 +15334,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15194,25 +15347,21 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Улічваць рэгістар"
@@ -15225,87 +15374,81 @@ msgstr "Пошук у паведамленьні"
 msgid "Find:"
 msgstr "Пошук:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Пошук"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Рэдагаваць подпіс"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Выключэньні"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Зьвесткі аб уліковым запісе"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Адмена..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Атрыманьне і адпраўленьне пошты"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Адмяніць _усё"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Абнаўленьне..."
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Апэрацыя адменена карыстальнікам."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Пазначце пароль"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Запомніць гэты пароль"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомніць гэты пароль да завяршэньня сэанса"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Неатрымліваецца захаваць файл подпіса: %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"
@@ -15315,23 +15458,23 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Адкінуць зьмены"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Захаваць подпіс"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Рэдагаваць подпіс"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Пазначце назву для гэтага подпіса."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Назва:"
 
@@ -15361,17 +15504,17 @@ msgstr "Перадасланае паведамленьне"
 msgid "Invalid folder: `%s'"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Наладка віртуальнае тэчкі %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15384,84 +15527,84 @@ msgstr ""
 "    \"%s\"\n"
 "І быдзе абноўлена."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба рэдагаваць віртуальную тэчку '%s' якая не існуе."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Нечытанае"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Прагледзенае"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Адказанае"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Шматлікія непрагледзеныя паведамленьні"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Шматлікія паведамленьні"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Ніжэйшы"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Ніжей"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Высокі"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Вышэйшы"
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "Сёньня %I:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Учора %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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
@@ -15509,7 +15652,7 @@ msgstr "Да выкананьня"
 msgid "For Your Information"
 msgstr "Да вашага ведама"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Перадаслаць"
 
@@ -15517,11 +15660,11 @@ msgstr "Перадаслаць"
 msgid "No Response Necessary"
 msgstr "Можна не адказваць"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Адказаць"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Адказаць усім"
 
@@ -15544,7 +15687,8 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "Умоўлена да:"
 
 #: mail/message-tags.glade.h:7
@@ -15765,7 +15909,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Адмяніць нараду для гэтага элемэнта"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr "Калі ласка выбярыце інфармацыю, якую вы жадаеце імпартаваць:"
 
@@ -15790,26 +15934,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Выбраць імпарт"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr "файл \"%s\" не існуе"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Імпартаваньне"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Імпартаваньне"
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
 msgstr "Памылка загрузк %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15818,35 +15962,35 @@ msgstr ""
 "Імпартаваньне %s\n"
 "Імпартаваньне 1 элемэнта."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Назва файла:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Выбярыце файл"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Тып файла:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Імпартаваньне даньняў і усталёвак са старых праграм"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Імпартаваньне асобнага файла"
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15854,26 +15998,26 @@ msgstr ""
 "Калі ласка пачакайце...\n"
 "Сканаваньне існуючых усталёвак"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтэлектуальнага імпарту"
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "Ад %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Правайдэр для пратакола \"%s\" недаступны"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Збой выкананьня gpg."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Імпарт"
@@ -15882,7 +16026,7 @@ msgstr "Імпарт"
 msgid "Closing connections..."
 msgstr "Закрыцьцё далучэньняў..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Наладкі \"Эвалюцыі\""
 
@@ -15916,11 +16060,11 @@ msgstr "Не атрымалася адкрыць падзеленую тэчку
 msgid "Cannot find the specified shared folder."
 msgstr "Немагчыма адшукаць пазначаную падзеленую тэчку."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Распачата імпартаваньне"
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15929,11 +16073,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Памочнік"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Назва тэчкі не пазначана"
@@ -15975,15 +16114,15 @@ msgstr "\"Bug buddy\" не запушчаны."
 msgid "About Ximian Evolution"
 msgstr "Пра \"Эвалюцыю\" Ximian"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Далучаны рэжым"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Адлучаны рэжым"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Працаваць у адлучаным рэжыме"
 
@@ -16035,7 +16174,6 @@ msgstr "Пазначальнік"
 
 #: 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 "Стварыць"
 
@@ -16092,19 +16230,20 @@ msgid "Create a new test item"
 msgstr "Стварыць новае заданьне"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Актыўныя далучэньні"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Актыўныя далучэньні"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Націсьніце \"Так\" каб закрыць гэтыя далучэньні й працаваць у адлучаным "
 "рэжыме"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Актыўныя у бягучы момант далучэньні:"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "Ка_ляндар:"
@@ -16226,28 +16365,28 @@ msgstr ""
 "Гэты дапаможнік правядзе вас па усім працэсе імпартаваньня\n"
 "вонкавых файлаў у \"Эвалюцыю\"."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Імпарт"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Імпарт"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Не імпартаваць"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Не пытацца наступнага разу."
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "\"Эвалюцыя\" можа імпартаваць даньні з наступных файлаў:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16267,7 +16406,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16275,48 +16414,48 @@ msgstr ""
 "Дзякуй\n"
 "Каманда распрацоўшчыкаў \"Эвалюцыі Ximian\"\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Не пытацца ў наступны раз."
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Няма доступу да абалонкі \"Эвалюцыі\"."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не атрымліваецца ініцыялізаваць абалонку \"Эвалюцыі\": %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Запуск у адлучаным рэжыме"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Запуск у далучаным рэжыме"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Прымусова выключыць усе кампанэнты \"Эвалюцыі\""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Даслаць вывад адладкі усіх кампанэнтаў у файле."
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "\"Эвалюцыя\""
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16325,50 +16464,61 @@ msgstr ""
 "%s: --online і --offline не могуць выкарыстоўвацца разам.\n"
 "  Use %s --help для атрыманьня падрабязнасьцяў.\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
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Выбраць імпарт"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Выкананьне"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Выраз"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрэса пошты:"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Сэртыфікат састарэў: %s\n"
 "Выдавец: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Пазначце пароль для %s"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Пазначце пароль для %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Пазначце пароль"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16572,7 +16722,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Ід карткі ужо існуе"
@@ -16874,7 +17025,7 @@ msgstr "Перамясьціць кантакты у іншую тэчку"
 msgid "Move to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Уставіць з буфэра абмену"
 
@@ -16883,8 +17034,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Прагледзіць выгляд кантактаў у друку"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Перадпрагляд друку"
 
@@ -16933,13 +17084,13 @@ msgstr "Спыніць загрузку"
 msgid "View the current contact"
 msgstr "Прагледзіць бягучы кантакт"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Дзеяньні"
 
@@ -16960,14 +17111,10 @@ msgid "_Save as VCard"
 msgstr "Захаваць як візытоўку"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "Шукаць кантакты"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Вылучыць усё"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Даслаць паведамленьне кантактанае асобе..."
 
@@ -16975,58 +17122,54 @@ msgstr "Даслаць паведамленьне кантактанае асо�
 msgid "Day"
 msgstr "Дзень"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Выдаліць усе падзеі"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Выдаліць сустрэчу"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Выдаліць гэтую падзею"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Выдаліць гэтую падзею"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Перайсьці"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Вярнуцца назад"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Ісьці далей"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Перайсьці да _даты"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Ісьці да пазначанай даты"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Перайсьці да сёньня"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Сьпіс"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Наступнае"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Прагледзіць выгляд каляндара ў друку"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Папярэдняе"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Надрукаваць гэты каляндар"
@@ -17035,7 +17178,7 @@ msgstr "Надрукаваць гэты каляндар"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Апублікаваць інфармацыю \"Вольны/Заняты\" для гэтага каляндара"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Старонка"
@@ -17047,35 +17190,55 @@ msgstr "Публічная тэчка утрымлівае сустрэчы і �
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Выбар імёнаў"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Ісьці да пазначанай даты"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Выбраць тэчку"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Паказаць падрабязнасьці"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Паказаць адзень"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Паказаць адзін месяц"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Паказаць адзін тыдзень"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Паказаць працоўны тыдзень"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Сёньня"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Прагледзіць бягучы кантакт"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Тыдзень"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Сустрэча"
@@ -17346,7 +17509,7 @@ msgstr "Пазначыць усё як _чытанае"
 msgid "Mark all visible messages as read"
 msgstr "Пазначыць усе бачныя паведамленьні як чытанае"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Уставіць паведамленьне(і) з буфэра абмену"
 
@@ -17518,312 +17681,314 @@ msgid "F_orward As..."
 msgstr "Перадаслаць"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Правілы філтра"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Фільтар па сьпісе рассылкі..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Фільтар па адпраўляльніку..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Фільтар па атрымоўцах..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Фільтар па тэме..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Пазначыць вылучаныя паведамленьні як няважныя"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "\"Да выкананьня\"..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Прымусова загружаць відарысы ў HTML лістах"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Перадаслаць вылучанае паведамленьне ў целе новага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Перадаслаць вылучанае паведамленьне цытаваным як адказ"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Перадаслаць вылучанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Перадаслаць вылучанае паведамленьне як укладаньне"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Павялічыць памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Загрузіць відарысы"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Пазначыць як важнае"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Пазначыць як нечытанае"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Пазначыць як няважнае"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Пазначыць вылучаныя паведамленьні як \"да чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Пазначыць вылучаныя паведамленьні як важныя"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Пазначыць вылучаныя паведамленьні як няважныя"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Пазначыць вылучаныя паведамленьні як \"не для чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Пазначыць вылучаныя паведамленьні як \"не для чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Пазначыць вылучаныя паведамленьні як няважныя"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Пазначыць вылучаныя паведамленьні для выдаленьня"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Перамясьціць"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Перамясьціць вылучаныя паведамленьні у іншую тэчку"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Наступнае"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Наступнае важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Наступнае абмеркаваньне тэмы"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Наступнае нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Адсутнічае"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Адкрыць вылучанае паведамленьне ў новым акне"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Адкрыць вылучанае паведамленьне ў рэдактары каб перадаслаць яго"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Арыгінальны памер"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "Папярэдняе нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Даслаць адказ"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Даслаць адказ на паведамленьне ў публічную тэчку"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Папярэдняе важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Прагледзіць выгляд паведамленьня ў друку"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Папярэдняе"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Надрукаваць гэтае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Пера_накіраваць"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Скінуць тэкст да ягонага арыгінальнага памера"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Шукаць паведамленьне..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "Меншы"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Захаваць паведамленьне як файл тэкста"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Усталяваць парамэтры аркуша для вашае бягучае друкаркі"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Паказаць крыніцу паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Паказаць усе загалоўкі"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Паказаць паведамленьне ў звычайным стылі"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Паказаць паведамленьне з усімі загалоўкамі"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Паказаць зьмест крыніцы паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Вярнуць з выдаленага вылучаныя паведамленьні"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "Віртуальная тэчка па сьпісе рассылкі..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "Віртуальная тэчка па адпраўляльніках..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "Віртуальная тэчка па атрымоўцах..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "Віртуальная тэчка па тэме..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "Як укладзенае"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Капіяваць у тэчку"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Стварыць фільтар з паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "Перайсьці да"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "Як убудаванае"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "Большы"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "Выгляд паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Перамясьціць у тэчку"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "Наступнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "Звычайны выгляд"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "Адкрыць паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "Папярэдняе паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Цытавана"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "Перадаслаць..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Інструмэнты"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "Вярнуць з выдаленага"
 
@@ -18091,41 +18256,41 @@ msgstr "Капіяваць вылучанае заданьне"
 msgid "Cut selected task"
 msgstr "Выразаць вылучанае заданьне"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Выдаліць скончаныя заданьні"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Выдаліць вылучаныя заданьні"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Пазначыць як скончанае"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "Пазначыць вылучаныя заданьні як выкананыя"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Уставіць заданьне з буфэра абмену"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Прагледзіць сьпіс заданьняў які мусіць быць надрукаваны"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Надрукаваць сьпіс заданьняў"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Выдаліць вылучаныя заданьні"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Заданьне"
@@ -18259,10 +18424,15 @@ msgid "_Day View"
 msgstr "Прагляд дня"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Прагляд карыстальніка"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Прагляд месяца"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Прагляд працоўнага тыдня"
 
@@ -18297,10 +18467,16 @@ msgid "_Messages"
 msgstr "Паведамленьні"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "з _катэгорыяй"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Умоўленая дата:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Усталяваць стан"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Заданьні"
 
@@ -18359,14 +18535,10 @@ msgstr "ПАСЧПСН"
 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 "Зараз"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Сёньня"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18376,82 +18548,87 @@ msgstr "Час мусіць быць у фармаце: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Адсоткавае значэньне мусіць быць між 0 і 100, уключна"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Балцкае"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Цэнтральна-эўрапейскае"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Кітайскае"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Кірылічнае"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Грэцкае"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Жыдоўскае"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Японскае"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Карэйскае"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Турэцкае"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Юнікод"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Заходне-эўрапейскае"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "Заходне-эўрапейскае"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Традыцыйнае"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "Спрошчанае"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Украінскае"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Візуальна"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Невядомы знаказбор: %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 "Кадаваньне набору сымбаляў"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Пазначце знаказбор для выкарыстаньня"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Іншае..."
 
@@ -18519,11 +18696,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "По_шук"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Рэдактар пошуку"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Захаваць пошук"
 
@@ -18544,15 +18726,15 @@ msgstr "_Адмысловае..."
 msgid "Choose Image"
 msgstr "Выбар файла"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "По_шук"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Шукаць зараз"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "А_чысьціць"
 
@@ -18583,6 +18765,339 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завершана)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Крыніцы кнігі адрэсаў..."
+
+#~ msgid "Selected:"
+#~ msgstr "Выбранае:"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Кантакт"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "і %d іншых картак."
+
+#~ msgid "Send an Email"
+#~ msgstr "Даслаць пошту"
+
+#~ msgid "1 day"
+#~ msgstr "1 дзень"
+
+#~ msgid "1 week"
+#~ msgstr "1 тыдзень"
+
+#~ msgid "1 hour"
+#~ msgstr "1 гадзіна"
+
+#~ msgid "1 minute"
+#~ msgstr "1 хвіліна"
+
+#~ msgid "1 second"
+#~ msgstr "1 сэкунда"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Апісаньне:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Сустрэча"
+
+#~ msgid "Alarms"
+#~ msgstr "Сыгналы"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Геаграфічнае разьмяшчэньне"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Кожныя %d дзён"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Кожныя %d тыдні"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Кожныя %d тыдні на"
+
+#~ msgid "every %d months"
+#~ msgstr "кожныя %d мясацаў"
+
+#~ msgid "Every %d years"
+#~ msgstr "Кожныя %d год"
+
+#~ msgid "Go To Date"
+#~ msgstr "Перайсьці да даты"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Перайсьці да сёньня"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Назва паслужніка"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_База пошуку:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "Перавышаны час чаканьня адказу на запыт STARTTLS: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "Памылка пад час адказу на STARTTLS"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "Перавышаны час чаканьня адказу на запыт HELO: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "Памылка адказу на HELO"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "Перавышаны час чаканьня адказу на запыт AUTH: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "Памылка запыту AUTH."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Памылка адказу на MAIL FROM"
+
+#~ msgid "DATA response error"
+#~ msgstr "Памылка адказу на DATA"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "Перавышаны час адпраўкі DATA: паведамленьне перарвана: %s: пошта не "
+#~ "даслана"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "Збой адказу пад час перарываньня DATA"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "Перавышаны час чаканьня адказу на RSET: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "Памылка адказу на RSET"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "Перавышаны час чаканьня адказу на запыт QUIT: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "Памылка адказу на QUIT"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d сэкунды таму"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d хвіліны таму"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d гадзіны таму"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d дзён таму"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d тыдні таму"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d месяцаў таму"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d гады таму"
+
+#~ msgid "Then"
+#~ msgstr "Тады"
+
+#~ msgid "If"
+#~ msgstr "Калі"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Рэдагаваньне фільтраў"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Рэдагаваньне віртуальных тэчак"
+
+#~ msgid "Outgoing"
+#~ msgstr "Дасланыя"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Скіраваць паведамленьне у каманду абалонкі"
+
+#~ msgid "Shell Command"
+#~ msgstr "Каманда абалонкі"
+
+#~ msgid "Rules"
+#~ msgstr "Правілы"
+
+#~ msgid "[script]"
+#~ msgstr "[сцэнар]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Дадаць подпіс сцэнара"
+
+#~ msgid "Current store format:"
+#~ msgstr "Бягучы фармат захаваньня:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Цела індэкса утрымлівае"
+
+#~ msgid "New store format:"
+#~ msgstr "Новы фармат захаваньня:"
+
+#~ 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 ""
+#~ "Увага: пад час канвэртаваньня між фарматамі паштовых скрыняў збой \n"
+#~ "(як недахоп дыскавае прасторы) може ня быць аўтаматычна адноўлены\n"
+#~ "Карыстайцеся гэтай магчымасьцю асьцярожна."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL не падтрымліваецца ў гэтае зборцы \"Эвалюцыі\")"
+
+#~ msgid "Account Information"
+#~ msgstr "Зьвесткі аб уліковым запісе"
+
+#~ msgid "Authentication"
+#~ msgstr "Аўтарызацыя"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Стварэньне паведамленьняў"
+
+#~ msgid "Configuration"
+#~ msgstr "Канфігурацыя"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Дапомныя паводзіны"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Выдаленьне пошты"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "<< Менш можнасьцяў"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Адмеціны і колеры"
+
+#~ msgid "Loading Images"
+#~ msgstr "Загрузка відарысаў"
+
+#~ msgid "Message Display"
+#~ msgstr "Адлюстраваньне паведамленьняў"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Шрыфт паведамленьня"
+
+#~ msgid "Optional Information"
+#~ msgstr "Дадатковая інфармацыя"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Шрыфты для друку"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Запомніць гэты пароль"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Запомніць гэты пароль"
+
+#~ msgid "Required Information"
+#~ msgstr "Неабходная інфармацыя"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Аднавіць дапомнае"
+
+#~ msgid "S_ecurity"
+#~ msgstr "Бясьпека"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Абараніць MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Наладка паслужніка"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "Тып аўтарызацыі: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Тып аўтарызацыі: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Дапомны подпіс:"
+
+#~ msgid "_Full name:"
+#~ msgstr "Поўнае імя:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Тоеснасьць"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "Чэрвень"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Атрыманьне пошты"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Вярнуць дапомнасьці"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "А_дпраўка пошты"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Адпраўленьне \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Збой на паведамленьні %d з %d"
+
+#~ msgid "Search"
+#~ msgstr "Пошук"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Рэдагаваць подпіс"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Выключэньні"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Памочнік"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Актыўныя у бягучы момант далучэньні:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "Шукаць кантакты"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Перайсьці да _даты"
+
+#~ msgid "Go to today"
+#~ msgstr "Перайсьці да сёньня"
+
+#~ msgid "With _Category"
+#~ msgstr "з _катэгорыяй"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Крыніцы кнігаў адрэсаў..."
 
@@ -18623,10 +19138,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Scanning directory"
 #~ msgstr "Сканаваньне каталёга"
 
-#, fuzzy
-#~ msgid "    "
-#~ msgstr "      "
-
 #~ msgid "Cannot copy folder: %s"
 #~ msgstr "Немагчыма капіяваць тэчку: %s"
 
@@ -18926,9 +19437,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "Рэдагаваць паслужнік LDAP"
 
-#~ msgid "Select Names"
-#~ msgstr "Выбар імёнаў"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Вылучаныя кантакты:"
 
@@ -18965,10 +19473,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Інфармацыя календара"
 
 #, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Паведамленьне, якое адлюстроўваецца:"
-
-#, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Стан:</b>"
 
@@ -18985,10 +19489,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Інфармацыя календара"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Умоўлена:</b> "
-
-#, fuzzy
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "Працоўны тыдзень"
 
@@ -19025,10 +19525,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Немагчыма стварыць каталёг %s: %s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Перадпрагляд"
-
-#, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "Выкананьне"
 
@@ -19310,9 +19806,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "New _Task"
 #~ msgstr "Новае заданьне"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "Акно \"Эвалюцыі\""
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Акно \"Эвалюцыі\""
@@ -19703,9 +20196,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "No cards"
 #~ msgstr "Няма карткі"
 
-#~ msgid "1 card"
-#~ msgstr "1 картка"
-
 #~ msgid "%d cards"
 #~ msgstr "%d карткі"
 
@@ -19773,9 +20263,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "_Save as..."
 #~ msgstr "Захаваць _як..."
 
-#~ msgid "End Date"
-#~ msgstr "Дата завяршэньня"
-
 #~ msgid "Print..."
 #~ msgstr "Друк..."
 
@@ -19814,9 +20301,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Failed to find a common bulk algorithm."
 #~ msgstr "Неатрымліваецца адшукаць агульны альгарытм."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "Неатрымалася дэкадаваць паведамленьне."
-
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Неатрымалася стварыць кантэкст подпіса PGP"
 
@@ -20036,9 +20520,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "However, the message was successfully sent."
 #~ msgstr "Аднак паведамленьне было пасьпяхова даслана."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Паведамленьне бяз назвы)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Пустое паведамленьне"
 
@@ -25018,12 +25499,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "News Feeds"
 #~ msgstr "Крыніцы навінаў"
 
-#~ msgid "One mont_h"
-#~ msgstr "Адзін меся_ц"
-
-#~ msgid "One w_eek"
-#~ msgstr "Адзін тыдзень"
-
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "Часьціня абнаўленьня (сэкунды):"
 
@@ -25042,9 +25517,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Паказываць тэмпературу ў:"
 
-#~ msgid "Tasks "
-#~ msgstr "Заданьні "
-
 #~ msgid "Weather Settings"
 #~ msgstr "Усталёўкі надвор'я"
 
@@ -25063,9 +25535,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "_New Feed"
 #~ msgstr "Новая крыніца"
 
-#~ msgid "_One day"
-#~ msgstr "Адзін дзень"
-
 #~ msgid "_Show full path for folders"
 #~ msgstr "Паказаць поўны _шлях да тэчак"
 
diff --git a/po/bg.po b/po/bg.po
index 4ea992a019..aaff5cafe3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2002-08-16 02:00+0300\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -16,6 +16,48 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9.6\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 "Редактирай адресната книга"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "с всички локални и актоивни отдалечени папки"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Съхрани Като"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Задачи"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "Няма карти"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 карта"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакти:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Прозорец на еволюшън"
+
 #: addressbook/conduit/address-conduit.c:272
 #, fuzzy
 msgid "Default Sync Address:"
@@ -105,61 +147,77 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Изтрий"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "Нов контакт:"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Създай нов контакт"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Нов списък с контакти"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "Списък _Контакти"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Създай нов списък с контакт"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Адресна книга"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Адресна книга"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Създава нова задача"
+
+#: addressbook/gui/component/addressbook-config.c:407
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Не успях да се свържа с LDAP сървъра."
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -167,27 +225,27 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Грешка при зареждане информацията за финтъра:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
@@ -214,17 +272,17 @@ msgstr "Сканира на \"%s\""
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Personal"
 msgstr "Вернал"
@@ -273,7 +331,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -282,7 +340,7 @@ msgstr ""
 "Не мога да отворя тази адресна книга. Проверете\n"
 "дали пътя съществува и дали имате права за достъп."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -292,7 +350,7 @@ msgstr ""
 "въвели невярно URI, или LDAP сървъра не работи.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -304,7 +362,7 @@ msgstr ""
 "програмата от CVS след като сте изтеглили и инсталирали \n"
 "OpenLDAP от хипервръзката отдолу.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -314,15 +372,15 @@ msgstr ""
 "въвели невярно URI, или LDAP сървъра не работи.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Не мога да отворя адресната книга"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -330,17 +388,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Въведедете парола за %s (потребител %s)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, което ще се показва в календара"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "URI, което ще се показва в календара"
@@ -364,17 +422,11 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _Проверка за подържани типове"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -389,65 +441,56 @@ msgstr " _Проверка за подържани типове"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Източници на адреси"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Източници на адреси"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Източник на Адресна книга"
-
-#: 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
 #, fuzzy
 msgid "Always"
 msgstr "Аляска"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -455,57 +498,57 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid "Connecting"
 msgstr "Концепсион"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Име на списък:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Email address:"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "Тъ_рси"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Never"
 msgstr "_всеки"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -515,32 +558,27 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Едно"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Обхват на търсенето: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Търся"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Selected:"
-msgstr "Изтрий"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -551,7 +589,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -560,7 +598,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -568,43 +606,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Източник на Информация"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Свързване със сървъра..."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Свързване със сървъра..."
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Неподържана схема"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -613,7 +651,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -621,7 +659,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -631,7 +669,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -641,27 +679,27 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -671,7 +709,7 @@ msgstr ""
 "Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
 "се само при показване."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -681,7 +719,7 @@ msgstr ""
 "Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
 "се само при показване."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -689,29 +727,29 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "Using email address"
 msgstr "Това е пощен_ски адрес"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -719,67 +757,55 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Дисплей"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_Редактирай"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Port number:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "_Search base:"
 msgstr "Търси в база:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Име на сървъра:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Време за забавяне (минути)"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "cards"
 msgstr "Няма карти"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Отново връзка с %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "general-tab"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "searching-tab"
 msgstr "Търся"
@@ -815,7 +841,7 @@ msgid "Send HTML Mail?"
 msgstr "Изпрати HTML поща?"
 
 #: 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 "Добави към контактите"
 
@@ -831,7 +857,7 @@ msgstr "Име"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Източник"
 
@@ -909,7 +935,8 @@ msgstr "Сътрудничество"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Редактор за Контакти"
 
@@ -918,7 +945,7 @@ msgid "D_epartment:"
 msgstr "От_дел"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Детайли"
@@ -1003,16 +1030,27 @@ msgstr "Ка_тегорий..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "Изтрий"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Редактирай"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
@@ -1058,8 +1096,8 @@ msgid "_Web page address:"
 msgstr "_Web адрес:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 #, fuzzy
 msgid "Address"
 msgstr "_Адрес:"
@@ -1067,14 +1105,14 @@ msgstr "_Адрес:"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 #, fuzzy
 msgid "Editable"
 msgstr "Разрешава"
@@ -2065,9 +2103,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 #, fuzzy
 msgid "Jabber"
 msgstr "Неименуван Списък с Контакти"
@@ -2082,21 +2120,22 @@ msgid "MSN Messenger"
 msgstr "_Пощенско Съобщение"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Обслужването е готово"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "_Местонахождение: "
@@ -2107,120 +2146,103 @@ msgid "Username"
 msgstr "_Потрбителско име:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Домашен"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
 msgstr "Корк"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Друго"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Източник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 #, fuzzy
 msgid "Contact"
 msgstr "Контакти"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Нов Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Виртуални Папки"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 #, fuzzy
 msgid "Changed"
 msgstr "Чад"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Потребителско име"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Редактор на категории не е наличен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Този контакт принадлежи на следните категории:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Съхрани Контакт като VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Сигурен ли сте, че искате\n"
-"да изтриете този контакт?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Сигурен ли сте, че искате\n"
-"да изтриете този контакт?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Работа"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "Айдахо"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Група"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не мога да намеря графичен обект за поле: `%s'"
@@ -2235,6 +2257,7 @@ msgid "_Edit Full"
 msgstr "Редактира Пълно"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Пълно Име:"
@@ -2246,6 +2269,23 @@ msgstr ""
 "\n"
 "E-поща:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Сигурен ли сте, че искате\n"
+"да изтриете този контакт?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Сигурен ли сте, че искате\n"
+"да изтриете този контакт?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрес _2:"
@@ -2351,25 +2391,28 @@ msgstr "Заглавие:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Потребителско име:"
+msgid "Add IM Account"
+msgstr "Акаунти"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Акаунти"
+msgid "_Account name:"
+msgstr "Потребителско име:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Обслужването е готово"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
 #, fuzzy
-msgid "Location:"
+msgid "_Location:"
 msgstr "_Местонахождение: "
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr ""
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Членове"
@@ -2393,27 +2436,28 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #, fuzzy
 msgid "Book"
 msgstr "Бодо"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #, fuzzy
 msgid "Is New List"
 msgstr "Нов Списък"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "Съхрани Списък като VCard"
 
@@ -2466,25 +2510,22 @@ msgid "No contacts"
 msgstr "Контакти"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Контакти"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Контакти"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Контакти"
+msgstr[1] "Контакти"
 
-#: 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
 #, fuzzy
 msgid "Query"
 msgstr "Гърнси"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Грешка при стартиране на %s"
@@ -2498,142 +2539,141 @@ msgstr "Молде"
 msgid "Error modifying card"
 msgstr "Грешка при модифициране на карта"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 #, fuzzy
 msgid "Name begins with"
 msgstr "завършва с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 #, fuzzy
 msgid "Email begins with"
 msgstr "завършва с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорията е"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Кое да е поле съдържа"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "Допълнителни..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: 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 "Съхрани като VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 #, fuzzy
 msgid "New Contact..."
 msgstr "Нов Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Нов списък с контакти"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Отиди в Папка..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 #, fuzzy
 msgid "Import..."
 msgstr "Внеси..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Тър_си за Контакти"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Източник на Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Настройки за Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Препрати Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Изпрати съобщението на Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Отпечатай"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Печат на Плик"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Отрежи"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копирай"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 #, fuzzy
 msgid "Current View"
 msgstr "_Текущ Преглед"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2642,7 +2682,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Коя да е категория"
@@ -2676,8 +2716,6 @@ msgid "Car Phone"
 msgstr "Телефон в автомобил"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Категории"
 
@@ -2686,7 +2724,7 @@ msgid "Company Phone"
 msgstr "Телефон на Компания"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2740,6 +2778,7 @@ msgid "Manager"
 msgstr "Мениджър"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Мобилен Телефон"
 
@@ -2748,7 +2787,7 @@ msgid "Nickname"
 msgstr "Прякор"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Бележка"
 
@@ -2757,7 +2796,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Организация"
 
@@ -2815,19 +2854,19 @@ msgid "Web Site"
 msgstr "Web страница"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 #, fuzzy
 msgid "Width"
 msgstr "Широчина:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 #, fuzzy
 msgid "Height"
 msgstr "Височина:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr ""
 
@@ -2888,93 +2927,96 @@ msgstr ""
 msgid "Adapter"
 msgstr "Адрар"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 #, fuzzy
 msgid "Selected"
 msgstr "Изтрий"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 #, fuzzy
 msgid "Has Cursor"
 msgstr "Сортиране на Задачи"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Членове"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "E-поща"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Корк"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Бостън"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Група"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Понце"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Вернал"
+msgid "work"
+msgstr "Корк"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "Болоня"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Вернал"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "Работа:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Домашен Факс"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Успешно"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2982,108 +3024,108 @@ msgstr "Успешно"
 msgid "Unknown error"
 msgstr "Неизвестна грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Отказан достъп"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картата не е намерена"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Карта ID вече съществува"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Протокола на се подържа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Прекратено"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Оторизацията пропадна"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Изисква Удостоверение"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Файлът `%s' не съществува."
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Искате ли да съхраните промените?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 #, fuzzy
 msgid "_Discard"
 msgstr "Динард"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Грешка при добавяне на списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Грешка при добавяне на карта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Грешка при модифициране на списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Грешка при модифициране на карта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Грешка при изтриване на списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Грешка при изтриване на карта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3092,55 +3134,55 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 #, fuzzy
 msgid "Overwrite"
 msgstr "Презаписване на файл?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Грешка при съхранението на файл: %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 "списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Премести съобщени(ето/ята) в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Копира избраната задача"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Няма карти"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Няма карти"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Избор на Контакт от Адресната книга"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Множество 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 за %s"
@@ -3177,36 +3219,33 @@ msgstr "Добави адрес към вече съществуващия ко�
 msgid "Querying Address Book..."
 msgstr "Търся в адресната книга..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Редактирай инфирмацията за контакти"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Слей адреса на ел. поща"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "и %d други карти."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "е една друга карта."
+msgid_plural "and %d other contacts."
+msgstr[0] "е една друга карта."
+msgstr[1] "е една друга карта."
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Покажи Пълните Заглавия"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Съхрани Контакт като VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Запиши в адресната книга"
 
@@ -3361,7 +3400,7 @@ msgstr "Полета"
 msgid "Number of columns:"
 msgstr "Брой колони:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Опций"
 
@@ -3546,7 +3585,7 @@ msgid "Unnamed List"
 msgstr "Неименуван Списък с Контакти"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Въведедете парола"
@@ -3635,7 +3674,7 @@ msgid "Evolution's Tasks component"
 msgstr "Композер на поща за Evolution."
 
 #: 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"
@@ -3682,24 +3721,24 @@ msgstr "Време за забавяне (минути)"
 msgid "_Edit appointment"
 msgstr "_Редактирай среща"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Отвори"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Няма описание."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3708,12 +3747,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Внимание"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3724,7 +3763,7 @@ msgstr ""
 "по ел. поща все още, но това напомняне е конфигурирано\n"
 "да изпраща поща."
 
-#: 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 "
@@ -3735,7 +3774,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Не показвай това съобщение отново."
@@ -3911,13 +3950,13 @@ msgstr "Съдържание на Коментар"
 msgid "Location contains"
 msgstr "Съдържания на описание"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Несъвпадащ"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3940,7 +3979,7 @@ msgid "Purge events older than"
 msgstr "е по малко от"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "дни"
 
@@ -3951,7 +3990,7 @@ 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.
 #: 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"
 
@@ -3973,82 +4012,82 @@ 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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 #, fuzzy
 msgid "New appointment"
 msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 #, fuzzy
 msgid "_Appointment"
 msgstr "Среща"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 #, fuzzy
 msgid "New meeting"
 msgstr "Настройки за Източник на Новини"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 #, fuzzy
 msgid "M_eeting"
 msgstr "Среща"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Създава нова задача"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Нова _Среща"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Създай нова папка"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4078,11 +4117,6 @@ msgstr "Изглед за Седмица"
 msgid "Month View"
 msgstr "Изгел за Месец"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "_Текущ Преглед"
-
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4102,16 +4136,16 @@ msgstr "Отказан достъп"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI, което ще се показва в календара"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -4180,11 +4214,11 @@ msgstr ""
 msgid "extra times every"
 msgstr "допълнително време всеки"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "часове"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "минути"
 
@@ -4207,11 +4241,11 @@ msgstr "Базов"
 msgid "Date/Time:"
 msgstr "Дата/Време:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "Показва съобщение"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Издава зук"
 
@@ -4220,18 +4254,17 @@ msgstr "Издава зук"
 msgid "Reminders"
 msgstr "Напомня"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Стартирай програма"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#, fuzzy
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Изпрати 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 "Обобщено:"
@@ -4262,7 +4295,7 @@ msgid "hour(s)"
 msgstr "час(ове)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "минут(а/и)"
 
@@ -4272,8 +4305,8 @@ msgstr "начало на среща"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr "Разрешен"
 
@@ -4289,19 +4322,19 @@ msgstr "Не Изтривай"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "Забрани"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr "Разрешава"
 
@@ -4325,7 +4358,7 @@ msgstr "30 минути"
 msgid "60 minutes"
 msgstr "60 минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
 msgid "Alerts"
 msgstr "Алберта"
@@ -4351,7 +4384,7 @@ msgid "Days"
 msgstr "Дни"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Раз_решен"
 
@@ -4449,7 +4482,7 @@ msgid "Wednesday"
 msgstr "Сряда"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Работна Седмица"
 
@@ -4497,7 +4530,6 @@ msgid "_Fri"
 msgstr "_Пет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Основен"
 
@@ -4594,7 +4626,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "_Списък със задачи"
@@ -4740,28 +4772,28 @@ msgstr "%s  Вие имате промени. Да ги забравя ли и �
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вие нямате направени промени, да обновя редактора?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, fuzzy, c-format
 msgid "Validation error: %s"
 msgstr "Неизвестна грешка: %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 " в"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Приключено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Приключено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Дължим"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Дължим"
 
@@ -4798,8 +4830,9 @@ msgstr "Запис в дневник - %s"
 msgid "No summary"
 msgstr "Няма резюме"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Съхрани като..."
 
@@ -4814,35 +4847,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Не мога да получа текущата версия!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Не мога да преименувам папката: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Прекрати действието"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Избор на отдалечена папка за импортиране на тези данни"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Календар"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "_Списък със задачи"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4871,19 +4889,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Сигурен ли сте, че искате да неименуван запис в дневника?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Сигурен ли сте, че искате да изтриете среща %d?"
+#, 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] "Сигурен ли сте, че искате да изтриете среща %d?"
+msgstr[1] "Сигурен ли сте, че искате да изтриете среща %d?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Сигурни ли сте, че искате да изтриете %d задачи?"
+#: 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] "Сигурни ли сте, че искате да изтриете %d задачи?"
+msgstr[1] "Сигурни ли сте, че искате да изтриете %d задачи?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Сигурни ли сте, че искате да изтриете %d журнални записи?"
+#: 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] "Сигурни ли сте, че искате да изтриете %d журнални записи?"
+msgstr[1] "Сигурни ли сте, че искате да изтриете %d журнални записи?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4950,7 +4974,7 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въведете Делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Среща"
 
@@ -5025,8 +5049,6 @@ msgstr "Календар"
 
 #: 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 "Класификация"
 
@@ -5082,13 +5104,13 @@ msgstr "Начало:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Без"
 
@@ -5146,13 +5168,13 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "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
@@ -5344,7 +5366,7 @@ msgid "_No recurrence"
 msgstr "_Няма повторение"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr "Махни"
 
@@ -5387,7 +5409,7 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: 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 ""
 
@@ -5396,6 +5418,28 @@ msgstr ""
 msgid "Save Event"
 msgstr "Съобщение на Календар"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Избери Папка"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Избор на отдалечена папка за импортиране на тези данни"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "_Списък със задачи"
+
 #: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
@@ -5428,39 +5472,39 @@ msgstr "% Приключено"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Приключено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr "Високо"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "В Прогрес"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "Ниско"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Нормално"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Не е Стартиран"
 
@@ -5476,7 +5520,7 @@ msgstr "Недефинирано"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Дана на Приключване:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5520,9 +5564,9 @@ msgstr "Не мога да отворя адресната книга"
 msgid "Con_fidential"
 msgstr "_Конфиденциален"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Описание:"
 
@@ -5532,11 +5576,13 @@ msgid "Folder:"
 msgstr "Пап_ка:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "На_чална Дата:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Крайна Дата"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5596,139 +5642,112 @@ msgid "Weekly"
 msgstr "Седмица"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d дни"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 ден"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d седмици"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 седмица"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d часове"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 час"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d минути"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d дни"
+msgstr[1] "%d дни"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 минута"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d седмици"
+msgstr[1] "%d седмици"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d секунди"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d часове"
+msgstr[1] "%d часове"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 секунда"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d минути"
+msgstr[1] "%d минути"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Изпрати email"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунди"
+msgstr[1] "%d секунди"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Неизвестно действие за изпълнение"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s преди започване на среща"
 
-#: 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 след започване на среща"
 
-#: 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 от началото на срещата"
 
-#: 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 преди края на срещата"
 
-#: 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 след края на срещата"
 
-#: 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 на края на срещата"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s в %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 е неизвестен тип за превключване"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Публичен"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Частен"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Конфиденциален"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Описание:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Крайна Дата"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Начална Дата"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Резюме"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-#, fuzzy
-msgid "color"
-msgstr " цвят"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Среща"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Свободно"
@@ -5764,145 +5783,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 "Да"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Не"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Повтарям"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Назначен"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Изтрий избраните обекти"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Обновява обектите"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Нова _Среща..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Всички Нови _Събития за Деня"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-#, fuzzy
-msgid "New Meeting"
-msgstr "Среща"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Нова Задача"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Печат..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Постави"
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Отиди на _Днес"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "Отиди _на Дата..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Потребителска Информация"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Отвори"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Запази като..."
-
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Отрежи"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "Копирай"
-
-#: calendar/gui/e-cal-view.c:1295
-#, fuzzy
-msgid "_Schedule Meeting..."
-msgstr "План на _Среща"
-
-#: calendar/gui/e-cal-view.c:1296
-#, fuzzy
-msgid "_Forward as iCalendar..."
-msgstr "Препраща като _iКалендар"
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Изтрии това С_ъбитие"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Изтрии Всички _Събития"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-#, fuzzy
-msgid "_Settings..."
-msgstr "Пощенски Настройки..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5947,36 +5860,89 @@ 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 "Изтрий избраните обекти"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Обновява обектите"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Отвори"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Отваря _Съобщение"
 
-#: 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 "Запази като..."
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "_Печат..."
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Отрежи"
+
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "Копирай"
+
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "_Постави"
+
+#: calendar/gui/e-calendar-table.c:1053
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Присвояване на Задача"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Маркира като Приключено"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Мар_кирай тази Задача като Завършена"
 
-#: 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 "_Изтрива Избраните Задачи"
 
-#: 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 "Кликнете за да добавите задача"
 
@@ -5985,38 +5951,105 @@ msgstr "Кликнете за да добавите задача"
 msgid "% Complete"
 msgstr "% Приключено"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Аларми"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Приключено"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Дата на приключване"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Срок"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Географска Позиция"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Начална Дата"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Сортиране на Задачи"
 
-#: 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 "Нова _Среща..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Всички Нови _Събития за Деня"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#, fuzzy
+msgid "New Meeting"
+msgstr "Среща"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Нова Задача"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Избери _Нишка"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Изтрии..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Потребителска Информация"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Копирай в Папка..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Премести в Папка..."
+
+#: calendar/gui/e-calendar-view.c:1276
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "План на _Среща"
+
+#: calendar/gui/e-calendar-view.c:1277
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Препраща като _iКалендар"
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Изтрии това С_ъбитие"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Изтрии Всички _Събития"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Отиди на _Днес"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "Отиди _на Дата..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Settings..."
+msgstr "Пощенски Настройки..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6048,26 +6081,26 @@ msgstr "%02i минутно разделяне"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -6077,114 +6110,101 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Пр_осто повторение"
 
-#: calendar/gui/e-itip-control.c:603
-#, fuzzy
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Всеки"
+msgid_plural "Every %d days"
+msgstr[0] "Всеки"
+msgstr[1] "Всеки"
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, fuzzy, c-format
-msgid "Every %d days"
-msgstr "%d дни"
-
-#: calendar/gui/e-itip-control.c:611
-#, fuzzy
 msgid "Every week"
-msgstr "Всеки"
+msgid_plural "Every %d weeks"
+msgstr[0] "Всеки"
+msgstr[1] "Всеки"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, fuzzy, c-format
-msgid "Every %d weeks"
-msgstr "%d седмици"
-
-#: calendar/gui/e-itip-control.c:616
-#, fuzzy
 msgid "Every week on "
-msgstr "Евъргриин"
-
-#: calendar/gui/e-itip-control.c:618
-#, fuzzy, c-format
-msgid "Every %d weeks on "
-msgstr "%d седмици"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Евъргриин"
+msgstr[1] "Евъргриин"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 #, fuzzy
 msgid " and "
 msgstr "Пясък"
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
-#, fuzzy
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "Един месец"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr ""
+msgid_plural "every %d months"
+msgstr[0] "Един месец"
+msgstr[1] "Един месец"
 
-#: calendar/gui/e-itip-control.c:662
-#, fuzzy
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Всеки"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] "Всеки"
+msgstr[1] "Всеки"
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Край: <b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Приключено "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iКалендарна информация"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iКалендар Грешка"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Неизвестна личност"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6192,314 +6212,319 @@ msgstr ""
 "<br> Моля, прегледайте следната информация и тогава изберете действие от "
 "долното меню."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Без</i>"
 
+#: calendar/gui/e-itip-control.c:930
+#, fuzzy
+msgid "Location:"
+msgstr "_Местонахождение: "
+
 #. 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
 #, fuzzy
 msgid "Status:"
 msgstr "_Статус:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Приет"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Отказан"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Избери действие:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Обновява"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Приеми"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Откажи"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Изпрати Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Обновява статуса на отговарящият"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Изпраща Последната Информация"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Прекръсва"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> публикува информация за среща."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Информация за Среща"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на срещата."
 
-#: 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> изисква вашето присъствие на срещата."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Предложение на срещата:"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желае да бъде добавен на съществуващата среща."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желае да получи последната информация за срещата.."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Заявка за Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> отговори на запитване за срещата."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Отговор на Среща"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> прекъсна срещата."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Прекъсване на срещата"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> изпрати неразбираемо съобщение."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Лошо Съобщение за Среща"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> публикува информация за задачата."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Информация за задача"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: 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> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Предложение за Задача"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желае да бъде добавен към съществуваща задача.."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Обновяване на Задача"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желае да получи последната информация за задача.."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Заявка за Обновяване на задача"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> отговори на включване в задача."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Отговор на Задача"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> прекъсна задача."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Прекъсване на Задача"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Лошо Съобщение за Задача"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> публикува информация свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> изисква от вас информация за свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Заявка Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> отговори на заявката свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Отговор Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Лошо Свободен/Зает Съобщение"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението съдържа само неподържани заявки."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прикаченото не съдържа валидно календар съобщение."
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Календарният файл не може да бъде зареден!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Обновяването приключено\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 ""
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Преместването Приключено"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "Обекта изпратен!\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 "Обекта не може да бъде изпратен!\n"
 
@@ -6635,7 +6660,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6721,12 +6746,12 @@ msgstr "_Приоритет:"
 msgid "Web Page:"
 msgstr "Страница"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Кликнете за да добавите задача"
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6734,7 +6759,7 @@ msgid ""
 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"
@@ -6742,62 +6767,64 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отваряне на задачи в %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Грешка при стартиране на %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Зарежда _Картинки"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Дата на приключване"
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 #, fuzzy
 msgid "Expunging"
 msgstr "Изтриване на папка"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Зарежда _Картинки"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Няма срещи"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Зарежда _Картинки"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Отвори в %s..."
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Торино"
@@ -6819,45 +6846,46 @@ msgid "February"
 msgstr "Февруари"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Отиди на Дата"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Януари"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Юли"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Юни"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Март"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Май"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Ноември"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Октомври"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Избор на Имена"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Септември"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Отиди на Днес"
+msgid "_Select Today"
+msgstr "Избери папка"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6941,7 +6969,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7098,81 +7126,81 @@ msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Избран ден (%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 "Избрана седмица (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Избран месец (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Задача"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %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 "Категории: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Печат на Обект"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Печатни Настройки..."
 
@@ -7181,40 +7209,40 @@ msgstr "Печатни Настройки..."
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 #, fuzzy
 msgid "New task"
 msgstr "Нова Задача"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Задачи"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "_Списък със задачи"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "_Списък със задачи"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8878,7 +8906,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не мога да отворя cache директория %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8886,7 +8914,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8897,7 +8925,7 @@ msgstr ""
 "%s\n"
 "Направените промени в тази папка няма да бъдат синхронизирани."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Ресинхронизира със сървър"
 
@@ -8914,7 +8942,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "Запазване на папка %s"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Вие трябва да сте в 'online' за да завършите тази операция"
 
@@ -9032,31 +9060,35 @@ msgstr "(съвпадение на всичи) изисква единичен �
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Неподържана операция: добавяне на съобщение за %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Неподържана операция: търсене по израз: за %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Неподържана операция: търсене по uids: за %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Премести съобщения"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 #, fuzzy
 msgid "Copying messages"
 msgstr "Копиране на съобщението в %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Получавам %d съобщение"
@@ -9086,7 +9118,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 "Прекратено."
 
@@ -9458,7 +9491,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Грешна оторизация отговори сървъра."
 
@@ -9663,7 +9696,7 @@ msgstr "Друга грешка"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сървър:%s, Тип: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не мога да взема папката. Грешна операция за това хранилище"
 
@@ -9672,21 +9705,22 @@ msgstr "Не мога да взема папката. Грешна операц�
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не мога да създам папката: Грешна операция за това хранилище"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не мога да изтрия папка %s: Грешна операция"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Кошче"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Юни"
@@ -9916,17 +9950,17 @@ msgstr "Няма такова съобщение: %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не мога да преименувам папката %s Грешна операция"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не мога да преименувам папката %s Няма такава папка"
@@ -9962,40 +9996,39 @@ msgstr "Използва филтри за нови съобщения в INBOX
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Автоматична проверка за нов email"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Име на сървъра"
+msgid "Address Book And Calendar"
+msgstr "Адресна книга"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "Търси в база:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Парола"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Гъста мъгла"
@@ -10003,12 +10036,12 @@ msgstr "Гъста мъгла"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Действието прекратено"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сървъра неочаквано се откачи: %s"
@@ -10064,12 +10097,12 @@ msgstr "Папката е била разрушена и пресъздаден�
 msgid "Scanning for changed messages"
 msgstr "Сканирам за променени съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: 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
@@ -10085,25 +10118,25 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Няма такова съобщение"
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Съобщението не е налично"
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Извличам обобщена информация за нови съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "Не мога да намеря тялото на съобщението в FETCH отговора."
 
@@ -10181,18 +10214,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s услуга за %s на %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
@@ -10202,14 +10235,14 @@ msgstr "%s услуга за %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не мога да се свържа към  %s (порт %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 ""
 
-#: 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
@@ -10217,53 +10250,53 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr "Връзкрата прекратена"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Не мога да се свържа с POP сърър.\n"
 "Грешно изпратено име на потребител %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
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Операцията не се подържа"
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Оторизацията пропадна"
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не мога да се свържа към сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сървър %s не подържа заявената оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Няма подръжка за оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sМоля въведете IMAP паролата за %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Вие не сте въвели парола."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10274,32 +10307,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "В името на папката не може да се съдържа символа 'Return'"
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "В името на папката не може да се съдържа символа 'Return'"
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "На бащината папка не е разрешено да има подпапки"
 
@@ -10332,20 +10366,20 @@ msgid "Index message body data"
 msgstr "Изпрати съобщение към контакт"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Не мога да отворя mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -10404,7 +10438,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"
@@ -10453,8 +10487,8 @@ msgstr "Не мога да изтрия файл с обобщение за па
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не мога да изтрия индексен файл за папка `%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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Не мога да изтрия файл с обобщение за папка `%s': %s"
@@ -10484,14 +10518,14 @@ msgstr "Грешно съдържание на съобщение"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Не мога да получа папка: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Папката `%s' не съществува."
@@ -10510,7 +10544,7 @@ msgstr "`%s' не е maildir директория."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не мога да изтрия папката `%s': %s"
@@ -10519,7 +10553,7 @@ msgstr "Не мога да изтрия папката `%s': %s"
 msgid "not a maildir directory"
 msgstr "не е maildir директория"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10528,23 +10562,23 @@ msgstr ""
 "Не мога да сканирам папка`%s':\n"
 "%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 "Не мога да отворя mailbox: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Проверка за нова поща"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Сканирам за нови съобщения"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10592,7 +10626,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Конструирането на съобщението пропадна: Повреден 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
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Не мога да създам папка с това име"
@@ -10623,32 +10657,32 @@ msgstr "`%s' не е обикновен файл."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папката `%s' не е празна. Не е изтрита."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Не мога да създам директория %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Карта ID вече съществува"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Указаното име на папка е невалидно: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
@@ -10692,7 +10726,7 @@ msgstr "Не мога да затворя папката източник %s: %s
 msgid "Could not close temp folder: %s"
 msgstr "Не мога да затворя временната папка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не мога да преименувам папката: %s"
@@ -10735,14 +10769,14 @@ msgstr "Прекъсна добавяне на MH съобщение"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Не мога да създам папка`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Не мога да получа папка: %s: %s"
@@ -11024,48 +11058,48 @@ msgstr "Не мога да преименувам папката %s на %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Не мога да преместя папка в една от нейните подпапки."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Не мога да създам програмен канал: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Не мога да получа съобщение: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP команда пропадна: %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
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Сканирам за нови съобщения"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 #, fuzzy
 msgid "Use cancel"
 msgstr "Прекръсва"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Действието прекратено"
@@ -11113,7 +11147,7 @@ msgstr "Изтрива след %s дни"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11203,7 +11237,7 @@ msgid "No such folder `%s'."
 msgstr "Няма такава папка `%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"
 
@@ -11258,12 +11292,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Изпращане на поща през програмата sendmail"
 
-#: 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 "За изпращане на поща използваща отдалечен mailhub с SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11389,13 +11424,13 @@ msgstr "Папката изглежда да е невъстановимо по�
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "AUTH заявка по таймаут: %s"
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
-msgid "STARTTLS response error"
-msgstr "RSET върна грешка: %s"
+msgid "STARTTLS command failed"
+msgstr "IMAP команда пропадна: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
@@ -11429,160 +11464,158 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP поща през %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Не мога да изпратя поща; адеса на изпращача не е указан."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Не мога да изпратя съобщение: няма зададен получател"
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Не мога да изпратя съобщение: няма зададен получател"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP Поздравления"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, fuzzy, c-format
-msgid "HELO request timed out: %s"
-msgstr "AUTH заявка по таймаут: %s"
+msgid "HELO command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
+#: camel/providers/smtp/camel-smtp-transport.c:960
 #, fuzzy
-msgid "HELO response error"
-msgstr "RSET върна грешка: %s"
+msgid "HELO command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP Удостоверение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Грешка при създаване на SASL оторизация"
 
-#: 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 заявка по таймаут: %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 команда пропадна: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH заявката пропадна"
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP команда пропадна: %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 "Лош отговор за оторизация от сървъра.\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 от заявката таймаут %s пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
+#: camel/providers/smtp/camel-smtp-transport.c:1170
 #, fuzzy
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM грешен отговор  %s: пощата не е изпратена"
+msgid "MAIL FROM command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO върна грешка: %s: пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
+#: 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 върна грешка: %s: пощата не е изпратена"
 
 #. 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
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
 #, fuzzy
-msgid "DATA response error"
-msgstr "RSET върна грешка: %s"
-
-#: 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 ""
+msgid "DATA command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-#, fuzzy
-msgid "DATA termination response error"
-msgstr "Грешна оторизация отговори сървъра."
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
 #, fuzzy
-msgid "RSET response error"
-msgstr "RSET върна грешка: %s"
+msgid "RSET command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, fuzzy, c-format
-msgid "QUIT request timed out: %s"
-msgstr "AUTH заявка по таймаут: %s"
+msgid "QUIT command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy
-msgid "QUIT response error"
-msgstr "RSET върна грешка: %s"
+msgid "QUIT command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "прикачен"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr "Изтрива избраните обекти от списъка на прикачени"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Добавя Прикачен...."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Прикрепи файл към съобщението"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Не мога да прикача файл %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 "Не мога да прикача файл %s: не е обикновен файл"
@@ -11605,24 +11638,24 @@ msgstr "MIME тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предлага автоматично показване на прикачен"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Необходимо е да конфигурирате потребител\n"
 "преди да създадете поща."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
 msgstr "Няма Описание"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Прикрепи файл към съобщението"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Кликнете тук за адресна книга"
 
@@ -11633,45 +11666,45 @@ msgstr "Кликнете тук за адресна книга"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Отговор-До:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Въведете получател на съобщението"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "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 "Въведете адреса на получателя на карбон копие за това съобщение"
 
-#: 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."
@@ -11682,12 +11715,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "Post To:"
 msgstr "Порто"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<натиснете тук за да изберете папка>"
@@ -11697,20 +11730,20 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Attach file(s)"
 msgstr "Прикрепи файл"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11719,30 +11752,30 @@ msgstr ""
 "Грешка при четеен на файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Файла съществува. Да го презапиша?"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Грешка при съхранението на файл: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Грешка при зареждането на файл: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Грешка при достъп на файл: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Не мога да получа съобщение от редактора"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11751,7 +11784,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11760,7 +11793,7 @@ msgstr ""
 "Не мога да отрежа файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11769,7 +11802,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11778,7 +11811,7 @@ msgstr ""
 "Грешка при автоматичното запазване на файл: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11787,7 +11820,7 @@ msgstr ""
 "Ximian Evolution намери незапазени файлове от предишната сесия.\n"
 "Искате ли да се опитам да ги възстановя?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11799,49 +11832,54 @@ msgstr ""
 "Искате ли да запазите промените?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Неименувано Съобщение)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Отвори файл"
 
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2084
 #, fuzzy
 msgid "Signature:"
 msgstr "Запазва сигнатура"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Напиши Съобщение"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11849,13 +11887,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11978,7 +12016,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11986,15 +12024,15 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да го презапиша ли?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Презаписване на файл?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Запомни тази парола"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Запомня тази парола за остатъка от тази сесия"
 
@@ -12078,13 +12116,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12093,100 +12131,81 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 секунда"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 секунда"
+msgstr[1] "1 секунда"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, fuzzy, c-format
-msgid "%d seconds ago"
-msgstr "%d секунди"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
 msgid "1 minute ago"
-msgstr "1 минута"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 минута"
+msgstr[1] "1 минута"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, fuzzy, c-format
-msgid "%d minutes ago"
-msgstr "%d минути"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
 msgid "1 hour ago"
-msgstr "1 час"
+msgid_plural "%d hours ago"
+msgstr[0] "1 час"
+msgstr[1] "1 час"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, fuzzy, c-format
-msgid "%d hours ago"
-msgstr "%d часове"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
 msgid "1 day ago"
-msgstr "1 ден"
+msgid_plural "%d days ago"
+msgstr[0] "1 ден"
+msgstr[1] "1 ден"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, fuzzy, c-format
-msgid "%d days ago"
-msgstr " преди"
-
-#: filter/filter-datespec.c:69
-#, fuzzy
 msgid "1 week ago"
-msgstr "1 седмица"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 седмица"
+msgstr[1] "1 седмица"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, fuzzy, c-format
-msgid "%d weeks ago"
-msgstr "%d седмици"
-
-#: filter/filter-datespec.c:70
-#, fuzzy
 msgid "1 month ago"
-msgstr "месец"
-
-#: filter/filter-datespec.c:70
-#, fuzzy, c-format
-msgid "%d months ago"
-msgstr " преди"
+msgid_plural "%d months ago"
+msgstr[0] "месец"
+msgstr[1] "месец"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, c-format
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, fuzzy, c-format
-msgid "%d years ago"
-msgstr " преди"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Забравихте да изберете дата."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<натиснете тук за да изберете дата>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "сега"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Изберете време за да го сравните отново"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Правила на Филтриране"
 
 #: filter/filter-file.c:166
@@ -12194,28 +12213,29 @@ msgstr "Правила на Филтриране"
 msgid "You must specify a file name."
 msgstr "Име на стил:"
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' не съществува или не е обикновен файл"
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 #, fuzzy
 msgid "Choose a file"
 msgstr "Избери действие:"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Тогава"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "Приключено "
 
 #: filter/filter-folder.c:153
 #, fuzzy
 msgid "You must specify a folder."
 msgstr "Име на стил:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Избери Папка"
 
@@ -12229,25 +12249,25 @@ 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 "Важно"
 
 #. 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
 #, fuzzy
 msgid "To Do"
 msgstr "Того"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Later"
 msgstr "след"
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Тест"
 
@@ -12255,60 +12275,64 @@ msgstr "Тест"
 msgid "You must name this filter."
 msgstr "Трябва да има име този филтър."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Име на правило:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Неименувано"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Ако"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "Приключено "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Изпълнява действия"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "ако всички критерии са изпълнени"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "ако някои от критериите е изпълнен"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "входящ"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "изходящ"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Сравни срещу"
+msgid "    "
+msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Редактирай Филтри"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правила на Филтриране"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Редактирай VFolders"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Източници на vПапки"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Сравни срещу"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Входящи"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Изходящи"
-
-#: filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12317,7 +12341,7 @@ msgstr ""
 "Времето на съобщението ще бъде сравнено\n"
 "с времето което сте задали тук."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12326,7 +12350,7 @@ msgstr ""
 "Времето на съобщението ще бъде сравнено\n"
 "с времето което сте задали тук."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12335,60 +12359,52 @@ msgstr ""
 "Времето на съобщението ще бъде сравнено\n"
 "с времето което сте задали тук."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Виртуални Папки"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "време относително към текущото"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "преди"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "месеци"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "секунди"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "задава само папки"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "текущото време"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 #, fuzzy
 msgid "the time you specify"
 msgstr "указано от вас време"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "Източници на vПапки"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "седмици"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "с всички активни отдалечени папки"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "с всички локални и актоивни отдалечени папки"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "с всички локални папки"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "години"
 
@@ -12528,7 +12544,7 @@ msgstr "Маркирано"
 msgid "Junk Test"
 msgstr "Юни"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12562,8 +12578,8 @@ msgstr "Премести в Папка"
 
 #: filter/libfilter-i18n.h:44
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Изпрати съобщението на Контакт"
+msgid "Pipe to Program"
+msgstr "Изиза от програмата"
 
 #: filter/libfilter-i18n.h:45
 #, fuzzy
@@ -12601,24 +12617,24 @@ msgstr "е по-голямо от"
 msgid "returns less than"
 msgstr "е по малко от"
 
-#: 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 "Стартирай програма:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Изпращач:"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Задава статус"
 
-#: filter/libfilter-i18n.h:56
-#, fuzzy
-msgid "Shell Command"
-msgstr "Компания"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Размер (кБ)"
@@ -12643,9 +12659,9 @@ msgstr "започва с"
 msgid "Stop Processing"
 msgstr "Прекрати Обработката"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Тема"
@@ -12655,17 +12671,13 @@ msgstr "Тема"
 msgid "Unset Status"
 msgstr "Задава статус"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Правила"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Добави Правило"
 
@@ -12678,9 +12690,10 @@ msgstr "Редактиране на Правило"
 msgid "Rule name"
 msgstr "Име на правило:"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
-msgstr ""
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
+msgstr "Разпределение"
 
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
@@ -12714,15 +12727,20 @@ msgstr "Темата съдържа"
 msgid "Subject does not contain"
 msgstr "Темата несъдържа"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Виртуални Папки"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Тази vпапка трябва да има име."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Необходимо е да зададете поне една папка като източник"
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 #, fuzzy
 msgid "VFolder source"
 msgstr "Източници на vПапки"
@@ -12780,8 +12798,8 @@ msgstr "Компонент на Evolution за показване на поще�
 msgid "Evolution Mail preferences control"
 msgstr "Компонент на Evolution за показване на пощенски папки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Поща"
@@ -12791,61 +12809,56 @@ msgstr "Поща"
 msgid "Mail Accounts"
 msgstr "Акаунти"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурен ли сте, че искате да изтриете този акаунт?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Не изтривай"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 #, fuzzy
 msgid "[Default]"
 msgstr "По подразбиране"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 #, fuzzy
 msgid "Account name"
 msgstr "Потребителско име:"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 #, fuzzy
 msgid "Protocol"
 msgstr "Пуерто Рико"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 #, fuzzy
 msgid "Unnamed"
 msgstr "Неименуван Контакт"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Име на стил:"
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-#, fuzzy
-msgid "[script]"
-msgstr "Няма Описание"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 #, fuzzy
 msgid "Language(s)"
 msgstr "Език"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:1000
 #, fuzzy
-msgid "Add script signature"
-msgstr "Добави критерии"
+msgid "Add signature script"
+msgstr "Изтрива всички сигнатури"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Файл с Подпис:"
@@ -12897,7 +12910,7 @@ msgstr ""
 "Не мога да отворя папката чернова за този акаунт.\n"
 "Искате ли да използвате подразбираща се?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Създава Виртуална _Папка От Съобщение"
@@ -12932,312 +12945,342 @@ msgstr "Следващо Непрочетено Съобщение"
 msgid "<click here to select a folder>"
 msgstr "<натиснете тук за да изберете папка>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Създай нова папка..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Укажете каде да бъде създадена папката:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Име на папка:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Зареждам"
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Изтривам папка %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Отваряне на папка %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Премести съобщени в %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Копиране на съобщението в %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Не мога да преименувам папката %s Грешна операция"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Избери папка"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Запазване на папка %s"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Създай нова папка"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Не мога да изтрия папката `%s': %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Не мога да изтрия папката:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Изтрий \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Не мога да преименувам папката %s Няма такава папка"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименувай папката \"%s\" на:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Преименувай папка"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Изглед"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Отвори в Нов Прозорец"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Премести"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова папка"
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Преименува"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Свойства..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Редактирай като ново съобщение..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "Печат"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Отговори на списъка"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Отговори на всички"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "Препрати"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Приключено"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Изчисти"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Отбележи: прочетено"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Маркирай като Не_важни"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Възстанови изтрито"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Премести в Папка..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Копирай в Папка..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Добави подателя в адресната книга"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Приложи Филтри"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Правила на Филтриране"
+
+#: mail/em-folder-view.c:785
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Създай правило от съобщението"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VFolder върху _Тема"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "v_Папка на Получатели"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "Филтър върху _Mailing List"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Филтър върху Т_ема"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Филтър върху Из_пращач"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Филтър върху По_лучатели"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Филтър върху Mailing _List"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Филтър върху Из_пращач"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "По подразбиране"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Отпечатай Съобщението"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Копира местоположениет на указател"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Кликнете за да добавите задача"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Съвпадения:"
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 #, fuzzy
 msgid "Unsigned"
 msgstr "Назначен"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13246,12 +13289,12 @@ msgstr ""
 "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 "повече информация."
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 #, fuzzy
 msgid "Valid signature"
 msgstr "Добави критерии"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13260,102 +13303,102 @@ msgstr ""
 "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 "повече информация."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Добави критерии"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Прекъснат"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP криптиране"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Сертифициран ID:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Съобщението не е налично"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 #, fuzzy
 msgid "Overdue:"
 msgstr "П_ресрочени задачи:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Работа в 'O_nline' "
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Скрий"
@@ -13365,73 +13408,74 @@ msgstr "Скрий"
 msgid "Page %d of %d"
 msgstr "Получаване на съобщение номер %d от %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
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Получавам съобщение %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указател към FTP сайт (%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 "Указател към локален файл (%s) валиден на сайта \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указател към локален файл (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указател към отдалечени данни (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указател към неизвестни външни данни (\"%s\" type)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Премести съобщения"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "От"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Отговор-До"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13439,57 +13483,92 @@ msgstr ""
 "Пощенска програма: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr "%s прикачен"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Неподържана схема"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Неуспех при проверка на сертификати"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Неуспех при проверка на сертификати"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Всеки"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "_Един Ден"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "_Една седмица"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Един месец"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13498,22 +13577,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
@@ -13556,34 +13635,34 @@ msgstr "Добави адресна книга"
 msgid "Open in %s..."
 msgstr "Отвори в %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Абонира"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Моля, изберете сървър."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Не е избран сървър"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Не показвай това съобщение отново."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13592,27 +13671,27 @@ msgstr ""
 "Грешка при зареждане информацията за финтъра:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Филтри"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Препратени съобщения"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "неизвестен изпрашач"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13621,7 +13700,7 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13630,38 +13709,38 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Съобщение"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Spool `%s' не съществува или не е обикновен файл"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Съхрани Съобщението Като..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "_Адрес:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail от %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не мога да създам временна директория: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13675,7 +13754,7 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13756,276 +13835,310 @@ msgstr "Отрязва избраните съобщения"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Отрязва избраните съобщения"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Превключи показването на панела с папките"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Превключи показването на панела с папките"
 
-#: 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 "Превключи показването на панела с папките"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Изпразва кошчето при излизане"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Изпразва кошчето при излизане"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Изпрати съобщението по-късно"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Акаунти"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Mail Конфигурация"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Mail Конфигурация"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Пита при изпращане на HTML съобщения до контакти които не я искат"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Пита когато се изпраща поща само с получатели в полето _Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Изпрати mail в HTML формат по подразбиране."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Изпрати mail в HTML формат по подразбиране."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Покажи Времето Като"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Покажи Времето Като"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Показва съобщение в нормален стил"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Предварителен преглед на Pane"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "Оригинален Контакт:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -14033,113 +14146,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Изпрати съобщението по-късно"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Изпрати съобщението по-късно"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Прави това моя подразбиращ се акаунт"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "Променливо"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Вмъкни"
@@ -14183,14 +14296,14 @@ msgstr "Evolution импортира вашите стари Elm пощи"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Импортира..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Моля почакайте"
 
@@ -14239,12 +14352,12 @@ msgstr "Импортира Файлове"
 msgid "Scanning %s"
 msgstr "Сканира на \"%s\""
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Приоритет: %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"
@@ -14259,7 +14372,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14267,7 +14380,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14276,25 +14389,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Настройки"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Редактирай Филтри"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14327,66 +14440,29 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Текущ формат за съхранение:"
-
-#: mail/local-config.glade.h:2
-#, fuzzy
-msgid "Index body contents"
-msgstr "Съдържанието на съобщенията"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Нов формат за съхранение:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Внимание - не е сигурно, че проблем (като свършване на дисковото "
-"пространство)\n"
-"възникнал по време на преобразуване между различните формати на пощенски "
-"кутии,\n"
-"ще може автоматично да се оправи. Използвайте внимателно тази възможност."
-
-#: 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 "Вие не сте попълнили всичи полета за необходимата информация."
 
 #. 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"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Хост:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "_Потрбителско име:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Път:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Вие не може да имате две сигнатури с едно име."
 
@@ -14419,11 +14495,11 @@ msgstr "Отговаря на"
 msgid "Add Filter Rule"
 msgstr "Добавя правило за Филтър"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14431,48 +14507,48 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Ново _Mail съобщение"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Пощенско Съобщение"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Напиши Съобщение"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Нов VFolder"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Редактирай Филтри"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Създай нова папка"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, което ще се показва в календара"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Потребител"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14483,12 +14559,13 @@ msgstr ""
 "\"опционални\" по-долу не е задължително да бъдат запълнени,\n"
 "освен ако не искате тази информация да бъде изпращана по пощата."
 
-#: 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
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14498,16 +14575,16 @@ msgstr ""
 "Ако не сте сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Моля, изберете от следните опции"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14517,11 +14594,11 @@ msgstr ""
 "сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Мениджър на Акаунт"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14537,135 +14614,260 @@ msgstr ""
 "да състави акаунта за пощата. Моля въведете име за този акаунт долу.\n"
 "Това име ще бъде предназначено само за показване."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Проверява Обслужване"
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr "Свързване със сървъра..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr " _Проверка за подържани типове"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Преглед"
+
 #: mail/mail-config.glade.h:4
 #, fuzzy
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL не се подържа в тази версия на evolution)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL не се подържа в тази версия на evolution)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "_Статус:"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Език"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Проверка за Нов email"
+
+#: mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+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
+#, fuzzy
+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 "Mail Конфигурация"
+
+#: 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 "PGP"
+
+#: 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 "Изпрати и Чернова Съобщение"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Винаги се самокриптира при изпращане на криптирана поща"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Account Editor"
 msgstr "Акаунт %d"
 
-#: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Account Информация"
-
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:36
 #, fuzzy
-msgid "Add Sc_ript"
-msgstr "Добави критерии"
+msgid "Add Ne_w Signature..."
+msgstr "Запазва сигнатура"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:37
 #, fuzzy
-msgid "Add new signature..."
-msgstr "Запазва сигнатура"
+msgid "Add _Script"
+msgstr "Добави критерии"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Винаги се самокриптира при изпращане на криптирана поща"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Attach original message"
 msgstr "Прикрепи файл към съобщението"
 
-#: 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 "Прикачен"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Удостоверение"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Автоматична проверка за нов email"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Автоматична проверка за нов email"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Неизвестна кодова таблица: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:52
 #, fuzzy
-msgid "C_olors"
-msgstr "_Затвори"
+msgid "Ch_eck for Supported Types "
+msgstr " _Проверка за подържани типове"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Проверка за Нов email"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Проверка за Нов email"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Цвят на задачи за деня"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Composing Messages"
-msgstr "Напиши Съобщение"
+msgid "Colors"
+msgstr "_Затвори"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Конфигурация"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Подтвърждение при редактиране на папка"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14682,339 +14884,304 @@ msgstr ""
 "\n"
 "Кликнете на \"Завърши\" за да запазите настройките."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "По Подразбиране"
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Default Behavior"
-msgstr "Дел Бажио"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:67
 #, fuzzy
-msgid "Default character _encoding:"
+msgid "Default character e_ncoding:"
 msgstr "Подразбираща се кодова таблица:"
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Deleting Mail"
-msgstr "Получаване на Пощата"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
+msgid "Defaults"
+msgstr "По подразбиране"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: 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 "Приключено"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:73
 #, fuzzy
-msgid "Drafts _folder:"
+msgid "Drafts _Folder:"
 msgstr "Папки _Черова"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Адресът за ел. поща съдържа"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Email _address:"
+msgid "Email _Address:"
 msgstr "Адрес на ел. поща"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
-msgid "Empty _trash folders on exit"
+msgid "Empty trash folders on e_xit"
 msgstr "_Изпразва кошчето при излизане"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Сертифициран ID:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за Акаунти"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Изпълнява действия"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "завършва с"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Опций"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Font Properties"
 msgstr "Свойства"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Препратени съобщения"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
 #, fuzzy
-msgid "H_eaders"
+msgid "HTML Mail"
+msgstr "В HTML поща"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Начало"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Подсветнато цитиране с"
 
-#: 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 ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:69
-#, fuzzy
-msgid "Labels and Colors"
-msgstr "Съхрани и Затвори"
-
-#: mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Loading Images"
-msgstr "Зарежда _Картинки"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Mail Конфигурация"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Местоположение на Пощенската кутия"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Message Composer"
 msgstr "Съобщения"
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "Message Display"
-msgstr "Показване на _Съобщение"
-
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "Съобщението съдържа"
-
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "New Mail Notification"
-msgstr "Mail Конфигурация"
-
-#: 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"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Опционална Информация"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Организа_ция:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Ключ ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Избери цвят"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Пита когато се изпраща поща само с получатели в полето _Bcc"
 
-#: mail/mail-config.glade.h:91
-#, fuzzy
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "PGP"
-
-#: mail/mail-config.glade.h:92
-#, fuzzy
-msgid "Printed Fonts"
-msgstr "Отпечатай избраните контактите"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Пощенска директория Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Quote original message"
 msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Запомни тази парол_а"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Запомни тази парола"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Отговор-До:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:117
 #, fuzzy
-msgid "Receiving _Options"
+msgid "Receiving Options"
 msgstr "Опции на Получаване"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Remember this _password"
+msgid "Remember _password"
 msgstr "Запомни тази парола"
 
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "изискана Информация"
-
-#: mail/mail-config.glade.h:102
-#, fuzzy
-msgid "Restore Defaults"
-msgstr "По подразбиране"
-
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "S_ecurity"
-msgstr "Сигурност"
+msgid "S_tandard Font:"
+msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:121
 #, fuzzy
-msgid "Secure MIME (S/MIME)"
-msgstr "Защитен MIME"
+msgid "Security"
+msgstr "_Сигурност"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Изтрии..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Изпати _папка със съобщения:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Изпрати и Чернова Съобщение"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Сървърът изисква ото_ризация"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Сървър Конфигурация"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Тип С_ървър:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Конфигурационната база данни не е намерена"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Запазва сигнатура"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Файл с Подпис:"
+
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Име на стил:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "Оригинален Контакт:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Тип:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
 "dictionary installed."
 msgstr ""
 
-#: 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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Променливо"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15025,204 +15192,121 @@ msgstr ""
 "\n"
 "Кликнете на \"Следващ\" за да започнете."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Файл с Подпис:"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr "_Винаги отказва да зарежда картинки от мрежата"
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "Тип на Идентифика_ция:"
-
-#: mail/mail-config.glade.h:140
-#, fuzzy
-msgid "_Authentication type: "
-msgstr "Тип на Идентифика_ция:"
-
-#: mail/mail-config.glade.h:141
-#, fuzzy
-msgid "_Automatically check for new mail every"
-msgstr "_Автоматична проверка за нов email"
-
-#: mail/mail-config.glade.h:142
-#, fuzzy
-msgid "_Automatically insert smiley images"
-msgstr "_Автоматична проверка за нов email"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:144
-#, fuzzy
-msgid "_Confirm when expunging a folder"
-msgstr "Подтвърждение при редактиране на папка"
-
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Default signature:"
-msgstr "_HTML сигнатура:"
+msgid "_Always load images from the Internet"
+msgstr "_Винаги отказва да зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:158
 #, fuzzy
-msgid "_Defaults"
-msgstr "По подразбиране"
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Enable"
 msgstr "Разрешава"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Препрати Като"
 
-#: mail/mail-config.glade.h:152
-#, fuzzy
-msgid "_Full name:"
-msgstr "_Пълно Име:"
-
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "_HTML Mail"
-msgstr "В HTML поща"
-
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "_Identity"
-msgstr "Потребител"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "Юни"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Зарежда картинки ако изпращача е в адресната книга"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Прави това моя подразбиращ се акаунт"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Маркир_ай съобщенията като \"Прочетени\" след:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Име:"
 
-#: 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 "_Никога не зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Пита при изпращане на HTML съобщения до контакти които не я искат"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Пита пр_и изпращане на поща без тема"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
-msgid "_Receiving Mail"
-msgstr "Получаване на Пощата"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Отговори на Всички"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Script:"
 msgstr "_Сигурност"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Изтрии..."
-
-#: mail/mail-config.glade.h:173
-#, fuzzy
-msgid "_Sending Mail"
-msgstr "Изпращане на Email"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Покажи Времето Като"
 
-#: mail/mail-config.glade.h:175
-#, fuzzy
-msgid "_Signatures"
-msgstr "_Файл с Подпис:"
-
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Standard Font:"
-msgstr "Стандартен Unix mbox"
-
-#: mail/mail-config.glade.h:177
-#, fuzzy
-msgid "_Terminal Font:"
-msgstr "Оригинален Контакт:"
-
 #: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr "Изплзва криптирана връзка (_SSL)"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "минут(а/и)"
+
 #: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "color"
+msgstr " цвят"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Сканира на \"%s\""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15231,7 +15315,7 @@ msgstr ""
 "Грешка при '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15240,7 +15324,7 @@ msgstr ""
 "Грешка при извършване на операция:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Работи"
 
@@ -15248,132 +15332,131 @@ msgstr "Работи"
 msgid "Filtering Folder"
 msgstr "Филтър върху папка"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Изпращане на \"%s\""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Грешка на съобщение %d от %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Неуспех при декодиране на съобщението"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импортира %s като %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Получавам %d съобщение"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Получавам %d съобщение"
+msgstr[1] "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Съхраняване на %d съобщения"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Съхраняване на %d съобщения"
+msgstr[1] "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15382,7 +15465,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15391,11 +15474,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15404,25 +15487,21 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Със значение на малки/големи букви"
@@ -15435,89 +15514,83 @@ msgstr "Търси в съобщението"
 msgid "Find:"
 msgstr "Намери:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Търсене"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Добави критерии"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Изключения"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Източник на Информация"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Прекратяване..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сървър:%s, Тип: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Път: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Изпращане и Получаване на поща"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Прекъсва Всичко"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Обновяване ..."
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Потребителя прекрати операцията."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведедете парола за %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Въведедете парола"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Запомни тази парола"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Запомня тази парола за остатъка от тази сесия"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Не мога да запазя сигнатурен файл."
 
-#: 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"
@@ -15527,25 +15600,25 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Запазва сигнатура"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 #, fuzzy
 msgid "Edit signature"
 msgstr "Добави критерии"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML сигнатура:"
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Име:"
 
@@ -15575,17 +15648,17 @@ msgstr "Препратени съобщения"
 msgid "Invalid folder: `%s'"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка на vпапка %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15594,84 +15667,84 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Опит за редактиране на vпапка '%s' която не съществува."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Прегледано"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Отговорено"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Множество Невидяни Съобщения"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Множество Съобщения"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Най долу"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Ниско"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "По Горе"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Най Горе"
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
@@ -15725,7 +15798,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Източник на Информация"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Препрати"
 
@@ -15733,11 +15806,11 @@ msgstr "Препрати"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Отговори"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Отговори на Всички"
 
@@ -15763,7 +15836,7 @@ msgstr ""
 
 #: mail/message-tags.glade.h:6
 #, fuzzy
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr "Дължим"
 
 #: mail/message-tags.glade.h:7
@@ -15994,7 +16067,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Прекъсва срещата за този пункт"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr "Моля, изберете информацията която искате да импортирате:"
 
@@ -16020,26 +16093,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Избери Папка"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлът `%s' не съществува."
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Импортира"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Импортира"
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
 msgstr "Грешка при зареждането на %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16048,35 +16121,35 @@ msgstr ""
 "Импортирам %s\n"
 "Импортирам обект 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Име на файл:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Избери файл"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Тип на файл:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Импорт на данни и настройки от стари програми"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Импорт на единичен файл"
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16084,26 +16157,26 @@ msgstr ""
 "Моля, почакайте...\n"
 "Сканирам за съществуващи настройки"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Стартира Интелигентно Импортиране"
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Няма наличен доставчик за протокол `%s'"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Вмъкни"
@@ -16112,7 +16185,7 @@ msgstr "Вмъкни"
 msgid "Closing connections..."
 msgstr "Затварям връзката..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Еволюшън "
@@ -16152,11 +16225,11 @@ msgstr ""
 "Не мога да създам указаната папка:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Стартира импорт"
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -16165,11 +16238,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Асистент"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Няма име на папка."
@@ -16214,15 +16282,15 @@ msgstr "Bug buddy не може да бъде стартиран."
 msgid "About Ximian Evolution"
 msgstr "Относно Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Работа в 'O_nline' "
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Работа в '_Offline'"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Работа в 'Offline'"
 
@@ -16275,7 +16343,6 @@ msgstr "Чико"
 
 #: 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 "Нов"
 
@@ -16333,16 +16400,17 @@ msgstr "Създава нова задача"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Active Connections"
+msgid "<b>Active Connections</b>"
 msgstr "Активни връзки"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Кликнете на OK за да затворите връзките и да преминете в 'offline'"
+#, fuzzy
+msgid "Active Connections"
+msgstr "Активни връзки"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Следните връзки са в момента активни:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Кликнете на OK за да затворите връзките и да преминете в 'offline'"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
@@ -16477,28 +16545,28 @@ msgstr ""
 "С него ще бъдете подпомогнати в процеса на импортиране\n"
 "на външни файлове в Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Импортери"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Вмъкни"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Не импортирай"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Не ме питай отново"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution не може да импортира данни от следните файлове:"
 
 #. 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"
@@ -16518,106 +16586,117 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Относно Evolution"
 
-#: shell/main.c:249
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Не ме питай отново"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Нямам достъп до Ximian Evolution shell."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не мога да инициализирам Ximian Evolution shell: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Стартира импорт"
 
-#: shell/main.c:491
+#: shell/main.c:502
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Стартира Интелигентно Импортиране"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Изпраща изхода от дебъга на всички компоненти във файл."
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Избери Папка"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Прогрес"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Израз"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрес на ел. поща"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Въведедете парола за %s"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Въведедете парола за %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Въведедете парола"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16820,7 +16899,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Карта ID вече съществува"
@@ -17133,7 +17213,7 @@ msgstr "Премести избраните съобщения в нова па�
 msgid "Move to Folder..."
 msgstr "Премести в Папка..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Поставя съдържанието на буфера за обмен"
 
@@ -17142,8 +17222,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Преглед на контактите за печат"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Печатен Преглед"
 
@@ -17193,13 +17273,13 @@ msgstr "Прекрати Зареждането"
 msgid "View the current contact"
 msgstr "текущото време"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Действия"
 
@@ -17220,14 +17300,10 @@ msgid "_Save as VCard"
 msgstr "_Запази като VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "Тър_си за Контакти"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Избери Всичко"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Изпрати Съобщението на Контакт.."
@@ -17236,62 +17312,58 @@ msgstr "Изпрати Съобщението на Контакт.."
 msgid "Day"
 msgstr "Ден"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Изтрива срещата"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Отиди"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Отива назад"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Отива напред"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Отиди на Дата"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Отва на определена дата"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Отиди на днес"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "List"
 msgstr "Листа"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Месец"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Следващ"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Предишен"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Отпечатай този календар"
@@ -17300,7 +17372,7 @@ msgstr "Отпечатай този календар"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Публична Свободна/Заета информация за този календар"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Бургес"
@@ -17312,35 +17384,55 @@ msgstr "Папката съдържа срещи и събития"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Избор на Имена"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Отва на определена дата"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Избери папка"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Показва Детайли"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Покажи един ден"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Покажи един месец"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Покажи една седмица"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Покажи работната седмица"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Днес"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "текущото време"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Седмица"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "Среща"
@@ -17620,7 +17712,7 @@ msgstr "Маркирай като _Прочетено"
 msgid "Mark all visible messages as read"
 msgstr "Маркирай всички видими съобщенията като прочетени"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Поставя съобщението в буфера за обмен"
@@ -17791,333 +17883,335 @@ msgid "F_orward As..."
 msgstr "Препрати"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Правила на Филтриране"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Филтър върху Пощенски _Списък.."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Филтър върху _Изпращач..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Филтър върху П_олучатели..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Филтър върху _Тема.."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Маркира избраните съобщения като неважни"
+
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Маркира избраните съобщения за изтриване"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "Пълно _Име..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Принуждава картинките в HTML поща да бъдат заредени"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Препраща избраното съобщение в тялото като ново съобщение"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Препраща избраното съобщение цитирано като отговор"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Препраща избраното съобщение за някой"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Препраща избраното съобщение за някой като прикачено"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Увеличава размера на текст"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Зарежда _Картинки"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Маркира като Важно"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Отбележи: непрочетено"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Маркирай като Не_важни"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Маркира избраните съобщения като прочетени"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Маркира избраните съобщения като важни"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Маркира избраните съобщения като неважни"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Маркира избраните съобщения като непрочетени"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Маркира избраните съобщения като непрочетени"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Маркира избраните съобщения като неважни"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Маркира избраните съобщения за изтриване"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Премести"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Премести избраните съобщения в нова папка"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Следващ"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Следващо Важно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Следваща Нишка"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Следващо Непрочетено Съобщение"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Не е намерен"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Отваря избраните съобщения в нов прозорец"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Отваря избраното съобщение в редактора за препращане"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Оригинален Раз_мер"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Предишно Непрочетено Съобщение"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Отговор на Задача"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Предишно Важно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Преглед на съобщението за печат"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Предишен"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Отпечатай това Съобщение"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Препраща избраното съобщение за някой"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Възстановява текста в неговият оригинален размер"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Търсене на съобщение..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "По-_малък"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Съхрани съобщението като текстови файл"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Настройка на страницата за вашият текущ принтер"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Показва Източника на Ел. Поща"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Покажи Пълните Заглавия"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Показва съобщение в нормален стил"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Показва съобщение със всички Пощенски заглавия"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Показва необработено съобщението на Ел. поща"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Раз_мер на Текст"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Не изтрива избраните съобщения"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder върху Пощенски списък..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VFolder върху _Изпращач"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VFolder върху _Получатели"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VFolder върху _Тема"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Attached"
 msgstr "Прикрепи"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Копирай в Папка"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Създай Правило От Съобщението"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Go To"
 msgstr "Отиди"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Inline"
 msgstr "Работа в 'O_nline' "
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_По-голям"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "Показване на _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Премести в _Папка"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Next Message"
 msgstr "Следващо Съобщение"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Нормално Показване"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "Отваря _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Предишно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 #, fuzzy
 msgid "_Resend..."
 msgstr "Преименувай..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Инс_трументи"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "Възстанови изтрито"
 
@@ -18390,45 +18484,45 @@ msgstr "Копира избраната задача"
 msgid "Cut selected task"
 msgstr "Отрязва избраната задача"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Изтрива избраните задачи"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Изтрива избраните задачи"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Маркира като Приключено"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "Мар_кирай тази Задача като Завършена"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Поставя задача от буфера за обмен"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Преглед на контактите за печат"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Отпечатай това Съобщение"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Изтрива избраните задачи"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Задачи"
@@ -18572,10 +18666,15 @@ msgstr "_Изглед за Ден"
 
 #: views/calendar/galview.xml.h:3
 #, fuzzy
+msgid "_List View"
+msgstr "_Текущ Преглед"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
 msgid "_Month View"
 msgstr "Изгел за Месец"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 #, fuzzy
 msgid "_Work Week View"
 msgstr "Изглед за Работна седмица"
@@ -18611,11 +18710,16 @@ msgstr "Съобщения"
 
 #: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With _Category"
-msgstr "С Категория"
+msgid "With _Due Date"
+msgstr "_Крайна Дата"
 
 #: views/tasks/galview.xml.h:2
 #, fuzzy
+msgid "With _Status"
+msgstr "Задава статус"
+
+#: views/tasks/galview.xml.h:3
+#, fuzzy
 msgid "_Tasks"
 msgstr "_Задачи"
 
@@ -18679,14 +18783,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 "Сега"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Днес"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18696,83 +18796,88 @@ msgstr "Датата трябва да е въведена в следния ф�
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Стойността на процентите трябва да е между 0 и 100, включително"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Балтиски"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Центална Европа"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Китайски"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Кирилица"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Гръцки"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Японски"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Корейски"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Турски"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Уникод"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Западна Европа"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "Западна Европа"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Традиционен"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "Опростен"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Украинска"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 #, fuzzy
 msgid "Visual"
 msgstr "Забрани"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Неизвестна кодова таблица: %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 "Кодировка"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Въведете кодова таблица за използване"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Друго..."
 
@@ -18840,11 +18945,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "Търсене"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Редактор за Търсене"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Запази Търсене"
 
@@ -18868,16 +18978,16 @@ msgstr "Допълнителни..."
 msgid "Choose Image"
 msgstr "Избери действие:"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "Търсене"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 #, fuzzy
 msgid "_Find Now"
 msgstr "Намери Сега"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Изчисти"
@@ -18910,6 +19020,368 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% приключено)"
 
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Източник на Адресна книга"
+
+#, fuzzy
+#~ msgid "Selected:"
+#~ msgstr "Изтрий"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Контакти"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "и %d други карти."
+
+#, fuzzy
+#~ msgid "Send an Email"
+#~ msgstr "Изпрати email"
+
+#~ msgid "1 day"
+#~ msgstr "1 ден"
+
+#~ msgid "1 week"
+#~ msgstr "1 седмица"
+
+#~ msgid "1 hour"
+#~ msgstr "1 час"
+
+#~ msgid "1 minute"
+#~ msgstr "1 минута"
+
+#~ msgid "1 second"
+#~ msgstr "1 секунда"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Описание:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Среща"
+
+#~ msgid "Alarms"
+#~ msgstr "Аларми"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Географска Позиция"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Every %d days"
+#~ msgstr "%d дни"
+
+#, fuzzy
+#~ msgid "Every %d weeks"
+#~ msgstr "%d седмици"
+
+#, fuzzy
+#~ msgid "Every %d weeks on "
+#~ msgstr "%d седмици"
+
+#~ msgid "Go To Date"
+#~ msgstr "Отиди на Дата"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Отиди на Днес"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Име на сървъра"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "Търси в база:"
+
+#, fuzzy
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "AUTH заявка по таймаут: %s"
+
+#, fuzzy
+#~ msgid "STARTTLS response error"
+#~ msgstr "RSET върна грешка: %s"
+
+#, fuzzy
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "AUTH заявка по таймаут: %s"
+
+#, fuzzy
+#~ msgid "HELO response error"
+#~ msgstr "RSET върна грешка: %s"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH заявка по таймаут: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH заявката пропадна"
+
+#, fuzzy
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM грешен отговор  %s: пощата не е изпратена"
+
+#, fuzzy
+#~ msgid "DATA response error"
+#~ msgstr "RSET върна грешка: %s"
+
+#, fuzzy
+#~ msgid "DATA termination response error"
+#~ msgstr "Грешна оторизация отговори сървъра."
+
+#, fuzzy
+#~ msgid "RSET response error"
+#~ msgstr "RSET върна грешка: %s"
+
+#, fuzzy
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "AUTH заявка по таймаут: %s"
+
+#, fuzzy
+#~ msgid "QUIT response error"
+#~ msgstr "RSET върна грешка: %s"
+
+#, fuzzy
+#~ msgid "%d seconds ago"
+#~ msgstr "%d секунди"
+
+#, fuzzy
+#~ msgid "%d minutes ago"
+#~ msgstr "%d минути"
+
+#, fuzzy
+#~ msgid "%d hours ago"
+#~ msgstr "%d часове"
+
+#, fuzzy
+#~ msgid "%d days ago"
+#~ msgstr " преди"
+
+#, fuzzy
+#~ msgid "%d weeks ago"
+#~ msgstr "%d седмици"
+
+#, fuzzy
+#~ msgid "%d months ago"
+#~ msgstr " преди"
+
+#, fuzzy
+#~ msgid "%d years ago"
+#~ msgstr " преди"
+
+#~ msgid "Then"
+#~ msgstr "Тогава"
+
+#~ msgid "If"
+#~ msgstr "Ако"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Редактирай Филтри"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Редактирай VFolders"
+
+#~ msgid "Outgoing"
+#~ msgstr "Изходящи"
+
+#, fuzzy
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Изпрати съобщението на Контакт"
+
+#, fuzzy
+#~ msgid "Shell Command"
+#~ msgstr "Компания"
+
+#~ msgid "Rules"
+#~ msgstr "Правила"
+
+#, fuzzy
+#~ msgid "[script]"
+#~ msgstr "Няма Описание"
+
+#, fuzzy
+#~ msgid "Add script signature"
+#~ msgstr "Добави критерии"
+
+#~ msgid "Current store format:"
+#~ msgstr "Текущ формат за съхранение:"
+
+#, fuzzy
+#~ msgid "Index body contents"
+#~ msgstr "Съдържанието на съобщенията"
+
+#~ msgid "New store format:"
+#~ msgstr "Нов формат за съхранение:"
+
+#~ 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 ""
+#~ "Внимание - не е сигурно, че проблем (като свършване на дисковото "
+#~ "пространство)\n"
+#~ "възникнал по време на преобразуване между различните формати на пощенски "
+#~ "кутии,\n"
+#~ "ще може автоматично да се оправи. Използвайте внимателно тази възможност."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#, fuzzy
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL не се подържа в тази версия на evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Account Информация"
+
+#~ msgid "Authentication"
+#~ msgstr "Удостоверение"
+
+#, fuzzy
+#~ msgid "Composing Messages"
+#~ msgstr "Напиши Съобщение"
+
+#~ msgid "Configuration"
+#~ msgstr "Конфигурация"
+
+#, fuzzy
+#~ msgid "Default Behavior"
+#~ msgstr "Дел Бажио"
+
+#, fuzzy
+#~ msgid "Deleting Mail"
+#~ msgstr "Получаване на Пощата"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "Опций"
+
+#, fuzzy
+#~ msgid "Labels and Colors"
+#~ msgstr "Съхрани и Затвори"
+
+#, fuzzy
+#~ msgid "Loading Images"
+#~ msgstr "Зарежда _Картинки"
+
+#, fuzzy
+#~ msgid "Message Display"
+#~ msgstr "Показване на _Съобщение"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "Съобщението съдържа"
+
+#~ msgid "Optional Information"
+#~ msgstr "Опционална Информация"
+
+#, fuzzy
+#~ msgid "Printed Fonts"
+#~ msgstr "Отпечатай избраните контактите"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Запомни тази парол_а"
+
+#, fuzzy
+#~ msgid "Remember this _password"
+#~ msgstr "Запомни тази парола"
+
+#~ msgid "Required Information"
+#~ msgstr "изискана Информация"
+
+#, fuzzy
+#~ msgid "Restore Defaults"
+#~ msgstr "По подразбиране"
+
+#, fuzzy
+#~ msgid "S_ecurity"
+#~ msgstr "Сигурност"
+
+#, fuzzy
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Защитен MIME"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Сървър Конфигурация"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "Тип на Идентифика_ция:"
+
+#, fuzzy
+#~ msgid "_Authentication type: "
+#~ msgstr "Тип на Идентифика_ция:"
+
+#, fuzzy
+#~ msgid "_Default signature:"
+#~ msgstr "_HTML сигнатура:"
+
+#, fuzzy
+#~ msgid "_Full name:"
+#~ msgstr "_Пълно Име:"
+
+#, fuzzy
+#~ msgid "_Identity"
+#~ msgstr "Потребител"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "Юни"
+
+#, fuzzy
+#~ msgid "_Receiving Mail"
+#~ msgstr "Получаване на Пощата"
+
+#, fuzzy
+#~ msgid "_Sending Mail"
+#~ msgstr "Изпращане на Email"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Изпращане на \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Грешка на съобщение %d от %d"
+
+#~ msgid "Search"
+#~ msgstr "Търсене"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Добави критерии"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Изключения"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Асистент"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Следните връзки са в момента активни:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "Тър_си за Контакти"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Отиди на Дата"
+
+#~ msgid "Go to today"
+#~ msgstr "Отиди на днес"
+
+#, fuzzy
+#~ msgid "With _Category"
+#~ msgstr "С Категория"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Източници на адреси"
 
@@ -19258,9 +19730,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "LDAP сървър"
 
-#~ msgid "Select Names"
-#~ msgstr "Избор на Имена"
-
 #, fuzzy
 #~ msgid "Selected Contacts:"
 #~ msgstr "Изтриване на Контакт?"
@@ -19291,10 +19760,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Календарна информация"
 
 #, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Съобщение за Показване"
-
-#, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "_Статус:"
 
@@ -19311,10 +19776,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Календарна информация"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "Приключено "
-
-#, fuzzy
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "Работна Седмица"
 
@@ -19351,10 +19812,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Не мога да създам директория %s: %s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Преглед"
-
-#, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "Прогрес"
 
@@ -19654,9 +20111,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "New _Task"
 #~ msgstr "Нова _Задача"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "Прозорец на еволюшън"
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Прозорец на еволюшън"
@@ -19992,9 +20446,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "No cards"
 #~ msgstr "Няма карти"
 
-#~ msgid "1 card"
-#~ msgstr "1 карта"
-
 #~ msgid "%d cards"
 #~ msgstr " %d карти"
 
@@ -20057,9 +20508,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "_Save as..."
 #~ msgstr "Съхрани като..."
 
-#~ msgid "End Date"
-#~ msgstr "Крайна Дата"
-
 #~ msgid "Print..."
 #~ msgstr "Печат..."
 
@@ -20089,9 +20537,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Failed to find certificate for \"%s\"."
 #~ msgstr "Неуспех при намиране на сертификат за \"%s\"."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "Неуспех при декодиране на съобщението"
-
 #, fuzzy
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Не мога да създам сигнатурен контекст за PGP"
@@ -20323,9 +20768,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "However, the message was successfully sent."
 #~ msgstr "Обаче, съобщението беше изпратено успешно."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Неименувано Съобщение)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Празно Съобщение"
 
@@ -25566,22 +26008,12 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "News Feeds"
 #~ msgstr "Новини"
 
-#~ msgid "One mont_h"
-#~ msgstr "Един месец"
-
-#~ msgid "One w_eek"
-#~ msgstr "_Една седмица"
-
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "Време за о_бновяване (секунди):"
 
 #~ msgid "Refresh _time (seconds):"
 #~ msgstr "Време за обно_вяване (секунди):"
 
-#, fuzzy
-#~ msgid "Schedule"
-#~ msgstr "Разпределение"
-
 #~ msgid "Show _all tasks"
 #~ msgstr "Покажи всички задачите"
 
@@ -25591,9 +26023,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Покажи температурите в:"
 
-#~ msgid "Tasks "
-#~ msgstr "Задачи"
-
 #, fuzzy
 #~ msgid "Weather Settings"
 #~ msgstr "Метеорологични настройки"
@@ -25616,9 +26045,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "_New Feed"
 #~ msgstr "Новини"
 
-#~ msgid "_One day"
-#~ msgstr "_Един Ден"
-
 #, fuzzy
 #~ msgid "_Show full path for folders"
 #~ msgstr "По_казва пълният път за папки"
@@ -26597,18 +27023,10 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Hulu"
 #~ msgstr "Хонолулу"
 
-#, fuzzy
-#~ msgid "Select a signature script"
-#~ msgstr "Изтрива всички сигнатури"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML сигнатура:"
 
 #, fuzzy
-#~ msgid "_Language:"
-#~ msgstr "Език"
-
-#, fuzzy
 #~ msgid "_Random"
 #~ msgstr "Радио"
 
@@ -26979,15 +27397,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Не мога да намеря 'От' адрес в съобщението"
 
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "Не мога да изпратя поща; адеса на изпращача не е указан."
-
-#~ msgid "RCPT TO response error: %s: mail not sent"
-#~ msgstr "RCPT TO върна грешка: %s: пощата не е изпратена"
-
-#~ msgid "DATA response error: %s: mail not sent"
-#~ msgstr "DATA върна грешка: %s: пощата не е изпратена"
-
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr "DATA върна грешка: съобщението прекъсна: %s: пощата не е изпратена"
 
diff --git a/po/ca.po b/po/ca.po
index 2532051ff8..70e8cfb5ec 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,14 +12,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 12:13+0200\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-29 12:21+0200\n"
 "Last-Translator: Softcatala <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.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"
 
 # fitxer: addressbook.gui.component.ca.po
@@ -103,7 +103,6 @@ msgstr "Configura el completat automàtic"
 #. 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
@@ -164,89 +163,108 @@ msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/addressbook-component.c:313
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "Nova llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/addressbook-component.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:434 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/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 "Suprimeix"
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/addressbook-component.c:315
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Propietats..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Nou contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:566
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Nova llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Crea una nova llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Nova llibreta d'adreces"
+
+# fitxer: camel.ca.po.3
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Llibreta d'adreces"
+
+# fitxer: calendar.ca.po.2
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Crea una nova tasca"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "S'ha produït un error en connectar amb el servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "S'ha produït un error en autenticar-se al servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "No s'ha pogut realitzar la consulta al Root DSE"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "El servidor ha respost amb bases de cerca no suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Aquest servidor no suporta la informació de l'esquema d'LDAPv3"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "S'ha produït un error en recuperar la informació de l'esquema"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "El servidor no ha contestat amb una informació d'esquema vàlida"
 
@@ -278,9 +296,8 @@ msgstr "S'està migrant '%s':"
 
 # fitxer: addressbook.gui.component.ca.po
 #. 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:430 calendar/gui/migration.c:509
+#: 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"
@@ -288,12 +305,9 @@ msgstr "En aquest ordinador"
 
 # fitxer: addressbook.gui.component.ca.po
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:517
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: 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"
@@ -362,7 +376,7 @@ msgid "This query did not complete successfully."
 msgstr "S'ha produït un error en l'execució d'aquesta consulta."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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."
@@ -371,7 +385,7 @@ msgstr ""
 "que hi teniu permís d'accés."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -381,7 +395,7 @@ msgstr ""
 "incorrecte o el servidor d'LDAP no està disponible."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "
@@ -392,7 +406,7 @@ msgstr ""
 "de sota i compilar el programa a partir del codi font del CVS."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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."
@@ -401,35 +415,35 @@ msgstr ""
 "incorrecte o el servidor no està disponible."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "S'està accedint anònimament al servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "S'ha produït un error en l'autenticació.\n"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduïu la contrasenya per a %s (usuari %s)"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 "L'identificador d'usuari (UID) de l'origen dels contactes que mostrarà la "
 "visualització"
 
 # fitxer: calendar.ca.po.5
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "La URI que mostrarà la llibreta d'adreces"
 
@@ -459,17 +473,11 @@ msgstr "L'URI de l'última carpeta utilitzada en el diàleg de selecció de noms
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  Mostra les bas_es suportades "
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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
@@ -492,63 +500,53 @@ msgid "*"
 msgstr "*"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr "2:30"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr "3268"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr "389"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr "5:00"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr "636"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "Address Book Creation Assistant"
 msgstr "Assistent de creació de la llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Fonts de la llibreta d'adreces"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Sempre"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anònimament"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -562,27 +560,27 @@ msgstr ""
 "Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "S'està connectant"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "_Nom distingit:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Adreça de correu electrònic:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "L'Evolution utilitzarà el DN per autenticar-vos al servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 ""
@@ -590,13 +588,13 @@ msgstr ""
 "servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "Ha finalitzat"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
@@ -604,19 +602,19 @@ msgid "General"
 msgstr "General"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "Grup:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Mai"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -633,27 +631,22 @@ msgstr ""
 "protocols."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "One"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Àmbit de la c_erca: "
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "S'està cercant"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Seleccionats:"
-
-# fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -664,7 +657,7 @@ msgstr ""
 "si aquest suporta SSL o TLS."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -682,7 +675,7 @@ msgstr ""
 "segura."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -697,7 +690,7 @@ msgstr ""
 "de seguretat."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "
@@ -709,7 +702,7 @@ msgstr ""
 "contactes. "
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -720,38 +713,38 @@ msgstr ""
 "\t\t\t  un nom i grup per a la visualització."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "Pas 1: Característiques de la carpeta"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Pas 2: Informació del servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Pas 3: Connectar-se al servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Pas 4: Cercar el directori"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Les bases de cerca suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -766,7 +759,7 @@ msgstr ""
 "si heu de modificar aquestes opcions."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -778,7 +771,7 @@ msgstr ""
 "Si ho deixeu en blanc, la cerca començarà a l'arrel de l'arbre de directoris."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -794,7 +787,7 @@ msgstr ""
 "vostra base.\n"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -811,7 +804,7 @@ msgstr ""
 "contacte amb l'administrador del sistema."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
 "\"."
@@ -819,7 +812,7 @@ msgstr ""
 "És el nom complet del servidor d'LDAP. Per exemple, 'ldap.mycompany.com'."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -830,7 +823,7 @@ msgstr ""
 "retardarà la llibreta d'adreces."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "
@@ -841,7 +834,7 @@ msgstr ""
 "d'LDAP."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -852,7 +845,7 @@ msgstr ""
 "Només s'utilitza per visualitzar-la."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "
@@ -862,7 +855,7 @@ msgstr ""
 "s'utilitza per visualitzar-la."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -875,33 +868,33 @@ msgstr ""
 "del sistema quin port heu d'especificar."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "L'opció especifica la durada de l'execució de la cerca."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Utilitza _SSL/TLS:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "S'està utilitzant el nom distingit (DN)"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "S'està utilitzant l'adreça de correu electrònic"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Sempre que sigui possible"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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"
@@ -914,71 +907,58 @@ msgstr ""
 "l'administrador del sistema."
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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 "Nom _de visualització"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Límit de baixa_da:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: 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:17
-#: mail/mail-config.glade.h:160 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 "_Edita"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Mètode d'entrada:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "Nombre del _port:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Ba_se de la cerca:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Nom del _servidor:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Temps d'espera (minuts):"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "targetes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "pestanya-connexió"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "pestanya-general"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "pestanya-cerca"
 
@@ -1036,7 +1016,7 @@ msgstr "Nom"
 # fitxer: addressbook.gui.component.ca.po
 #: 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 "Font"
 
@@ -1119,7 +1099,8 @@ msgstr "Col·laboració"
 # fitxer: addressbook.gui.contact-editor.ca.po
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
@@ -1234,15 +1215,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-calendar-table.c:1057 calendar/gui/e-calendar-table.c:1075
+#: 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:2504 mail/em-folder-view.c:765
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Suprimeix"
 
+# fitxer: addressbook.gui.component.ca.po
+#: 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 "_Edita"
+
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
@@ -2537,7 +2530,7 @@ msgstr "Novell Groupwise"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: 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"
@@ -2555,7 +2548,7 @@ msgstr "Missatgeria de l'MSN"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2816
+#: 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"
@@ -2582,24 +2575,24 @@ msgstr "Nom d'usuari"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2481
-#: addressbook/gui/contact-editor/e-contact-editor.c:2777
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Particular"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2781
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: 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 "Feina"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2482
-#: addressbook/gui/contact-editor/e-contact-editor.c:2785
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Altres"
 
@@ -2642,53 +2635,53 @@ msgid "Account Name"
 msgstr "Nom del compte"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1463
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "L'editor de categories no està disponible."
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1471
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Aquest contacte pertany a les categories:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1695
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Desa el contacte com a VCard"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2480
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Feina"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: 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"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: 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"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: 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"
 
 # fitxer: camel.ca.po.3
-#: addressbook/gui/contact-editor/e-contact-editor.c:2817
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
 msgstr "Groupwise"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2879,6 +2872,11 @@ msgstr "Serve_i de MI:"
 msgid "_Location:"
 msgstr "_Ubicació:"
 
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
+
 # fitxer: addressbook.gui.contact-list-editor.ca.po
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
@@ -2909,7 +2907,7 @@ msgstr "editor de la llista de contactes"
 #: 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"
@@ -2923,6 +2921,7 @@ msgstr "És una llista nova"
 # fitxer: addressbook.gui.contact-list-editor.ca.po
 #. Construct the app
 #: 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 "Editor de la llista de contactes"
 
@@ -2998,7 +2997,7 @@ msgstr[1] "%d contactes"
 # fitxer: addressbook.gui.widgets.ca.po
 #: 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"
@@ -3020,35 +3019,36 @@ msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "El nom comença per"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "El correu electrònic comença per"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: 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 "La categoria és"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. 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 "Qualsevol camp conté"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: 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 "Avançat..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: 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:12
 #: calendar/gui/e-meeting-list-view.c:249
@@ -3057,114 +3057,115 @@ msgid "Type"
 msgstr "Tipus"
 
 # fitxer: camel.ca.po.3
-#: addressbook/gui/widgets/e-addressbook-view.c:497
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Desa com a VCard"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Nou contacte..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Nova llista de contactes..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Vés a la carpeta..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importa..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Cerca els contactes..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Fonts de la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Configuració del Pilot..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenvia el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Envia un missatge al contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "Imprimeix"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Imprimeix el sobre"
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Copia a la llibreta d'adreces..."
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Mou a la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Retalla"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:432 calendar/gui/tasks-component.c:363
+#: 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 "Copia"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: 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 "Enganxa"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 #: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Visualització actual"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3177,7 +3178,7 @@ msgstr ""
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Qualsevol categoria"
@@ -3551,7 +3552,6 @@ msgstr "Correcte"
 #: 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/imap4/camel-imap-store.c:288
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
@@ -3821,19 +3821,19 @@ msgid "GTK Tree View"
 msgstr "Visualització d'arbre del GTK"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Prova de reflux"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: 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."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Hauria de provar l'element de l'àrea de dibuix de reflux"
 
@@ -4673,7 +4673,7 @@ msgstr "Buida els esdeveniments anteriors a"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "dies"
 
@@ -4685,10 +4685,6 @@ msgstr "%A %d %B %Y"
 # fitxer: calendar.ca.po.5
 #. 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:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -4722,80 +4718,80 @@ msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "S'eliminarà el calendari '%s'. Esteu segur de voler continuar?"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:430
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nou calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:926
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Nova cit_a"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:927
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "Cit_a"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:928
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Nova reunió"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "R_eunió"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:935
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Crea una nova petició de reunió"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Nova cita de tot el dia"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Cita de tot el _dia"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita de tot el dia"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Nou calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "C_alendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Crea un nou calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:1016
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "No s'ha pogut obrir el calendari '%s' per crear esdeveniments i reunions"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:1028
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hi ha cap calendari disponible per crear esdeveniment i reunions"
 
@@ -4944,12 +4940,12 @@ msgid "extra times every"
 msgstr "temps extra per cada"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hores"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "minuts"
 
@@ -5054,8 +5050,8 @@ msgstr "inici de la cita"
 # fitxer: calendar.ca.po.5
 #. 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:493
-#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
+#: 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 "Habilitat"
 
@@ -5072,20 +5068,20 @@ msgstr "No el suprimeixis"
 # fitxer: calendar.ca.po.5
 #: 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:399
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Inhabilita"
 
 # fitxer: calendar.ca.po.5
 #: 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:401
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Habilita"
 
@@ -5261,7 +5257,7 @@ msgstr "Dimecres"
 
 # fitxer: calendar.ca.po.5
 #: 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 "Setmana laborable"
 
@@ -5434,7 +5430,7 @@ msgstr ""
 
 # fitxer: calendar.ca.po.5
 #: 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 "Nova llista de tasques"
 
@@ -5696,8 +5692,8 @@ msgstr "Sense resum"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/comp-editor.c:1360
-#: calendar/gui/e-calendar-table.c:1190 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
@@ -6013,16 +6009,11 @@ msgstr "Hora d'_inici:"
 
 # fitxer: calendar.ca.po.4
 #. 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:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: 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:443
@@ -6314,7 +6305,7 @@ msgstr "Se_nse periodicitat"
 
 # fitxer: calendar.ca.po.4
 #: 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 "Sup_rimeix"
 
@@ -6365,7 +6356,7 @@ msgstr ""
 "Voleu desar els canvis?"
 
 # fitxer: calendar.ca.po.4
-#: 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 "_Descarta els canvis"
 
@@ -6445,7 +6436,7 @@ msgstr "Completada"
 # fitxer: calendar.ca.po.4
 #: 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 "Alta"
 
@@ -6460,14 +6451,14 @@ msgstr "En procés"
 # fitxer: calendar.ca.po.4
 #: 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 "Baixa"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Normal"
 
@@ -6821,14 +6812,9 @@ msgstr "No"
 #: 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/imap4/camel-imap-engine.c:1525
-#: camel/providers/imap4/camel-imap-engine.c:1552
-#: camel/providers/imap4/camel-imap-engine.c:1582
-#: camel/providers/imap4/camel-imap-engine.c:1622
-#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
-#: 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 "Es desconeix"
 
@@ -6898,29 +6884,29 @@ msgid "100%"
 msgstr "100%"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:698 calendar/gui/e-calendar-view.c:626
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
 msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:861 calendar/gui/e-calendar-view.c:727
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: 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 "_Obre"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Obre una pàgina _web"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
+#: 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
@@ -6928,17 +6914,17 @@ msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1082
+#: 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:39 ui/evolution-comp-editor.xml.h:19
+#: 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:23
+#: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Im_primeix..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
+#: 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
@@ -6946,50 +6932,50 @@ msgid "C_ut"
 msgstr "Re_talla"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
+#: 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:2497 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
+#: 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 "_Copia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1080
+#: 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:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
+#: 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 "E_nganxa"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "R_eenvia com a iCalendar"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca les tasques seleccionades com a acabades"
 
 # fitxer: calendar.ca.po.3
-#: 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 "Suprimeix les tasques selecciona_des"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1368
+#: calendar/gui/e-calendar-table.c:1371
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Cliqueu per afegir una tasca"
@@ -7002,7 +6988,7 @@ msgstr "% acabat"
 
 # fitxer: calendar.ca.po.3
 #: 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:597
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Acabat"
 
@@ -7054,19 +7040,20 @@ msgstr "Nova reunió"
 msgid "New Task"
 msgstr "Nova tasca"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1316
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Vés a _avui"
+# fitxer: ui.evolution-mail-list.xml.h.ca.po
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Selecciona un _fil"
 
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1251 calendar/gui/e-calendar-view.c:1318
-msgid "_Go to Date..."
-msgstr "Vés a una _data..."
+# fitxer: mail.ca.po.1
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Selecciona..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publica la informació lliure/ocupat"
 
@@ -7102,6 +7089,16 @@ msgstr "Suprimeix aquesta a_parició"
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
+# fitxer: calendar.ca.po.4
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Vés a _avui"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "Vés a una _data..."
+
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
 msgid "_Settings..."
@@ -7109,10 +7106,6 @@ msgstr "Configu_ració..."
 
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -7120,10 +7113,6 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -7150,10 +7139,6 @@ msgstr "%02i divisions de minut"
 # fitxer: calendar.ca.po.3
 #. 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:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -7162,9 +7147,6 @@ msgstr "%A, %d de %B"
 # fitxer: calendar.ca.po.3
 #. 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:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -7392,7 +7374,7 @@ msgstr "Envia l'última informació"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -7840,10 +7822,6 @@ msgstr "%A, %d de %B de %Y"
 # fitxer: calendar.ca.po.3
 #. 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
@@ -7853,10 +7831,6 @@ msgstr "%a %d/%m/%Y"
 # fitxer: calendar.ca.po.3
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -7960,13 +7934,13 @@ msgid "Web Page:"
 msgstr "Pàgina web:"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliqueu per obrir %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8025,25 +7999,25 @@ msgid "Expunging"
 msgstr "S'està ampliant"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/gnome-cal.c:1758
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "S'estan carregant les cites a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1777
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "S'estan carregant les tasques a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1797
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1926
+#: calendar/gui/gnome-cal.c:1928
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -8052,7 +8026,7 @@ msgstr ""
 " ha fallat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1940
 #, fuzzy, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
@@ -8061,7 +8035,7 @@ msgstr ""
 " ha fallat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:2752
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "S'està eliminant"
 
@@ -8087,53 +8061,55 @@ msgstr "febrer"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Vés a una data"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "gener"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "juliol"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "juny"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "març"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "maig"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "novembre"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "octubre"
 
+# fitxer: ui.evolution-composer-entries.xml.h.ca.po
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Selecciona tot el text"
+
 # fitxer: calendar.ca.po.3
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "setembre"
 
-# fitxer: calendar.ca.po.3
+# fitxer: mail.ca.po.3
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Vés a avui"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Seleccioneu una carpeta"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
@@ -8241,7 +8217,7 @@ msgstr "Aniversaris"
 
 # fitxer: calendar.ca.po.3
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "A la web"
 
@@ -8539,43 +8515,43 @@ msgstr ""
 "Se suprimirà la llista de tasques '%s'. Esteu segur de voler continuar?"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Nova tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Crea una nova tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Nova llista de tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "Llista de _tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Crea una llista de tasques nova"
 
 # fitxer: calendar.ca.po.2
-#: 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 "No es pot obrir la llista '%s' per crear els esdeveniments i reunions"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "No hi ha cap calendari disponible per crear les tasques"
 
@@ -10879,7 +10855,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "S'ha cancel·lat."
 
@@ -11341,7 +11317,7 @@ msgstr "Les credencials referenciades han caducat."
 #: 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:1198
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "La resposta d'autenticació del servidor és incorrecta."
 
@@ -11583,36 +11559,36 @@ msgid "Signer: %s <%s>: %s\n"
 msgstr "Signador: %s <%s>: %s\n"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "No s'ha pogut obtenir la carpeta. L'operació és invàlida en aquest magatzem"
 
 # fitxer: camel.ca.po.2
-#: camel/camel-store.c:242
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "No s'ha pogut crear la carpeta. L'operació és invàlida en aquest magatzem"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:377 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 "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:773 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Paperera"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: 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"
@@ -11990,13 +11966,13 @@ msgstr "Llista de comprovacions"
 #: 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:2887
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "S'ha cancel·lat l'operació"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2890
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor s'ha desconnectat inesperadament: %s"
@@ -12198,24 +12174,20 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:425
-#: camel/providers/imap4/camel-imap-store.c:166
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor d'IMAP %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:427
-#: camel/providers/imap4/camel-imap-store.c:168
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei d'IMAP per a %s a %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap-store.c:209
-#: camel/providers/imap4/camel-imap-store.c:226
+#: 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
@@ -12226,17 +12198,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap-store.c:211
+#: 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 "L'SSL no està disponible"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:801
-#: camel/providers/imap4/camel-imap-store.c:223
+#: 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
@@ -12245,59 +12215,58 @@ msgid "Connection cancelled"
 msgstr "S'ha cancel·lat la connexió"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/imap4/camel-imap-store.c:287
+#: 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 "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:636
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "No se suporta l'extensió SSL/TLS."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:667
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "S'ha produït un error en la negociació SSL"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:804
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No s'ha pogut connectar amb l'ordre '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1228
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no suporta el tipus d'autenticació sol·licitat (%s)"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1238
+#: 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 se suporta el tipus d'autenticació %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1261
+#: 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 "%sIntroduïu la contrasenya IMAP per a %s@%s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "No heu introduït la contrasenya."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1304
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12309,23 +12278,22 @@ msgstr ""
 "\n"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1723
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "La carpeta '%s' no existeix"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1734
-#: camel/providers/imap/camel-imap-store.c:2023
-#: camel/providers/imap4/camel-imap-store.c:636
+#: 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 "El nom de carpeta '%s' no és vàlid perquè conté el caràcter '%c'"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1758
+#: 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
@@ -12334,144 +12302,16 @@ msgid "Cannot create folder `%s': folder exists."
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:2035
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "La carpeta pare és desconeguda: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:2071
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "La carpeta pare no pot contenir subcarpetes"
 
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP server %s: %s"
-msgstr "Resposta inesperada del servidor IMAP: %s"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-engine.c:411
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/imap4/camel-imap-engine.c:417
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-engine.c:1135
-#: camel/providers/imap4/camel-imap-engine.c:1524
-#: camel/providers/imap4/camel-imap-engine.c:1551
-#: camel/providers/imap4/camel-imap-engine.c:1581
-#: camel/providers/imap4/camel-imap-engine.c:1621
-#: camel/providers/imap4/camel-imap-utils.c:289
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "El servidor s'ha desconnectat inesperadament: %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:1136
-msgid "Got BYE response"
-msgstr ""
-
-# fitxer: camel.ca.po.2
-#: camel/providers/imap4/camel-imap-store.c:262
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
-
-# fitxer: camel.ca.po.1
-#: camel/providers/imap4/camel-imap-store.c:374
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"No es pot connectar amb el servidor POP %s. No se suporta el mecanisme "
-"d'autenticació sol·licitat."
-
-# fitxer: camel.ca.po.1
-#: camel/providers/imap4/camel-imap-store.c:419
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIntroduïu la contrasenya SMTP per a %s a la màquina %s"
-
-# fitxer: camel.ca.po.1
-#: camel/providers/imap4/camel-imap-store.c:493
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-store.c:672
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr ""
-"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/imap4/camel-imap-store.c:677
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "No s'ha pogut crear la carpeta '%s': %s"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-store.c:699
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "No s'ha pogut suprimir la carpeta: %s. La carpeta no existeix"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-store.c:728
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-store.c:733
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-store.c:791
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/imap4/camel-imap-store.c:796
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "No s'ha pogut crear la carpeta '%s': %s"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-store.c:835
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr ""
-"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/imap4/camel-imap-store.c:840
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "No s'ha pogut crear la carpeta '%s': %s"
-
-# fitxer: camel.ca.po.3
-#: camel/providers/imap4/camel-imap-utils.c:83
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Resposta inesperada del servidor IMAP: %s"
-
-#: camel/providers/imap4/camel-imap-utils.c:106
-msgid "No data"
-msgstr ""
-
 # fitxer: camel.ca.po.2
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
@@ -12510,22 +12350,22 @@ msgstr "Dades del cos de l'índex del missatge"
 
 # fitxer: camel.ca.po.2
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # fitxer: camel.ca.po.2
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "bústia de correu: %s (%s)"
 
 # fitxer: camel.ca.po.2
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -12932,7 +12772,7 @@ msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
@@ -13956,52 +13796,52 @@ msgid "QUIT command failed"
 msgstr "L'ordre QUIT ha fallat"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "fitxer adjunt"
 
 # fitxer: composer.ca.po
-#: 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 "Elimina els elements seleccionats de la llista de fitxers adjunts"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Adjunta un fitxer..."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
 # fitxer: composer.ca.po
-#: 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 "No s'ha pogut adjuntar el fitxer %s: %s"
 
 # fitxer: composer.ca.po
-#: 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 "No s'ha pogut adjuntar el fitxer %s: no és un fitxer normal"
@@ -14028,22 +13868,22 @@ msgid "Suggest automatic display of attachment"
 msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
 
 # fitxer: composer.ca.po
-#: 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 "Heu de configurar un compte abans de poder redactar un correu."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destí de l'enviament"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Escolliu a quines carpetes s'enviarà el missatge."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Cliqueu per anar a la llibreta d'adreces"
 
@@ -14055,7 +13895,7 @@ msgstr "Cliqueu per anar a la llibreta d'adreces"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:573
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Respon a:"
 
@@ -14063,7 +13903,7 @@ msgstr "Respon a:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:579
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "De:"
 
@@ -14071,37 +13911,37 @@ msgstr "De:"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Assumpte:"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Per a:"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Introduïu els destinataris del missatge"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Cc:"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduïu les adreces que rebran una còpia del missatge"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Bcc:"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:603
+#: 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."
@@ -14113,12 +13953,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Envia a:"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Cliqueu per seleccionar les carpetes on s'hi envia"
 
@@ -14128,7 +13968,7 @@ msgid "Attach file(s)"
 msgstr "Adjunta fitxers"
 
 # fitxer: composer.ca.po
-#: 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 ""
@@ -14136,7 +13976,7 @@ msgstr ""
 "de signatura per a aquest compte"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -14145,7 +13985,7 @@ msgstr ""
 "de xifratge per a aquest compte"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -14155,35 +13995,35 @@ msgstr ""
 "%s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "El fitxer existeix. Voleu sobreescriure'l?"
 
 # fitxer: composer.ca.po
-#: 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 "S'ha produït un error en desar el fitxer: %s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "S'ha produït un error en carregar el fitxer: %s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "S'ha produït un error en accedir el fitxer: %s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge de l'editor"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -14193,7 +14033,7 @@ msgstr ""
 "%s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -14203,7 +14043,7 @@ msgstr ""
 "%s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -14213,7 +14053,7 @@ msgstr ""
 "%s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -14223,7 +14063,7 @@ msgstr ""
 " %s"
 
 # fitxer: composer.ca.po
-#: 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?"
@@ -14232,7 +14072,7 @@ msgstr ""
 "Voleu provar de recuperar-los?"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -14244,32 +14084,32 @@ msgstr ""
 "Voleu desar-ne els canvis?"
 
 # fitxer: mail.ca.po.1
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "Missatges sense títol"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Atenció: s'ha modificat el missatge"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Obre un fitxer"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Signatura:"
-
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1317
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "Generat automàticament"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Signatura:"
+
+# fitxer: composer.ca.po
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -14277,25 +14117,25 @@ msgstr[0] "S'ha adjuntat <b>%d</b> fitxer"
 msgstr[1] "S'han adjuntat <b>%d</b> fitxers"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 "_Oculta la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
 # fitxer: composer.ca.po
-#: 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 ""
 "_Mostra la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
 # fitxer: composer.ca.po
-#: 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 "Redacta un missatge"
 
 # fitxer: composer.ca.po
-#: 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."
@@ -14304,7 +14144,7 @@ msgstr ""
 "no s'ha pogut activar el control de selecció d'adreces."
 
 # fitxer: composer.ca.po
-#: 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"
@@ -14317,7 +14157,7 @@ msgstr ""
 "correctes de gtkhtml i libgtkhtml.\n"
 
 # fitxer: composer.ca.po
-#: 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."
@@ -14326,7 +14166,7 @@ msgstr ""
 "no s'ha pogut activar el component editor d'HTML."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:4239
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -14516,8 +14356,6 @@ msgstr "Categories de sincronització:"
 # fitxer: e-util.ca.po
 #. 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 %m/%d/%Y %I:%M %p"
@@ -14525,8 +14363,6 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 # fitxer: e-util.ca.po
 #. 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 %m/%d/%Y %H:%M"
@@ -14587,14 +14423,12 @@ msgstr "%m/%d/%Y %H"
 
 # fitxer: e-util.ca.po
 #. 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"
 
 # fitxer: e-util.ca.po
 #. 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"
@@ -14602,9 +14436,6 @@ msgstr "%H:%M:%S"
 # fitxer: e-util.ca.po
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
@@ -14612,9 +14443,6 @@ msgstr "%I:%M %p"
 
 # fitxer: e-util.ca.po
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -14709,6 +14537,12 @@ msgid "Select a time to compare against"
 msgstr "Seleccioneu amb quina hora es compara"
 
 # fitxer: filter.ca.po
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Regles del filtre"
+
+# fitxer: filter.ca.po
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Heu d'especificar un nom de fitxer."
@@ -14754,20 +14588,20 @@ msgstr ""
 
 # fitxer: filter.ca.po
 #: 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:90
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Important"
 
 # fitxer: filter.ca.po
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
+#: 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 "Per fer"
 
 # fitxer: filter.ca.po
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Després"
@@ -14833,54 +14667,27 @@ msgstr "      "
 # fitxer: filter.ca.po
 #: filter/filter.glade.h:2
 #, fuzzy
-msgid "<b>Filter Rules</b>"
-msgstr "Regles del filtre"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>Virtual _Folders</b>"
-msgstr "Carpetes virtuals"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:4
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
 msgstr "Regles del filtre"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 #, fuzzy
 msgid "<b>vFolder Sources</b>"
 msgstr "Fonts de la vFolder"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Compara amb"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Edita els filtres"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Edita les VFolders"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrada"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Sortida"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -14889,7 +14696,7 @@ msgstr ""
 "de la data que indiqueu."
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -14898,7 +14705,7 @@ msgstr ""
 "amb una hora relativa."
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -14907,62 +14714,62 @@ msgstr ""
 "actual quan s'hagi de filtrar."
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "fa"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "mesos"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segons"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "només les carpetes específiques"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "l'hora actual"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "una hora que indiqueu"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "setmanes"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "amb totes les carpetes remotes actives"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "amb totes les carpetes locals i les remotes actives"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "amb totes les carpetes locals"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "anys"
 
@@ -15262,7 +15069,7 @@ msgid "Stop Processing"
 msgstr "Atura el processament"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: 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
@@ -15276,7 +15083,7 @@ msgstr "No defineixis l'estat"
 
 # fitxer: filter.ca.po
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Heu d'escollir un altre nom perquè la regla '%s' ja existeix."
@@ -15297,8 +15104,9 @@ msgid "Rule name"
 msgstr "Nom de la regla"
 
 # fitxer: filter.ca.po
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Regles de puntuació"
 
 # fitxer: filter.ca.po
@@ -15342,6 +15150,12 @@ msgid "Subject does not contain"
 msgstr "L'assumpte no conté"
 
 # fitxer: filter.ca.po
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Carpetes virtuals"
+
+# fitxer: filter.ca.po
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Heu d'assignar un nom a aquesta vfolder."
@@ -15417,8 +15231,8 @@ msgid "Evolution Mail preferences control"
 msgstr "Control de preferències de correu de l'Evolution"
 
 # fitxer: mail.ca.po.3
-#: 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 "Correu"
@@ -15434,59 +15248,55 @@ msgid "Mail Preferences"
 msgstr "Preferències del correu"
 
 # fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Esteu segur de voler suprimir aquest compte?"
 
 # fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "No ho suprimeixis"
 
 # fitxer: mail.ca.po.3
 #. translators: default account indicator
-#: mail/em-account-prefs.c:445
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Predeterminat]"
 
 # fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Nom del compte"
 
 # fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protocol"
 
 # fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
-#: 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 "Sense nom"
 
 # fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:336
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Heu d'especificar un nom de fitxer de seqüència vàlid."
 
 # fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
-msgid "[script]"
-msgstr "[seqüència]"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:878
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Idiomes"
 
-# fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:926
-msgid "Add script signature"
-msgstr "Afegeix una signatura de seqüència"
+# fitxer: mail.ca.po.1
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Afegeix la signatura"
 
 # fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:946
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Signatures"
 
@@ -15552,7 +15362,7 @@ msgstr ""
 "Voleu fer servir la carpeta d'esborranys predeterminada?"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea carpetes _virtuals a partir de la cerca..."
 
@@ -15594,7 +15404,7 @@ msgid "Create New Folder"
 msgstr "Crea una carpeta nova"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: 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:"
@@ -15608,7 +15418,7 @@ msgstr "_Nom de la carpeta:"
 
 # fitxer: mail.ca.po.3
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -15629,141 +15439,141 @@ msgid "Loading..."
 msgstr "S'està carregant..."
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:877
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "S'està suprimint la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:879
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "S'està obrint la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:883
+#: mail/em-folder-tree.c:886
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:885
+#: mail/em-folder-tree.c:888
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a %s"
 
 # fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No s'ha deixar anar els missatges al magatzem de nivell superior"
 
 # fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:1947
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "No s'ha pogut moure la carpeta '%s'. L'operació no és vàlida"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: 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 "Seleccioneu una carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2035
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "S'està creant la carpeta '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Crea una carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "No s'ha pogut suprimir la carpeta : %s"
 
 # fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:2361
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "No s'ha pogut suprimir la carpeta local %s."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Voleu suprimir la carpeta '%s' i totes les seves subcarpetes?"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Suprimeix '%s'"
 
 # fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:2411
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "No s'ha pogut canviar el nom de la carpeta local %s."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Canvia el nom de la carpeta '%s' a:"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Canvia el nom de la carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Ja existeix una carpeta anomenada '%s'. Feu servir un nom diferent."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2492 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 "_Visualitza"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Obre'l e_n una finestra nova"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Mou"
 
 # fitxer: mail.ca.po.3
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Nova carpeta..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "Ca_nvia el nom"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietats..."
 
@@ -15949,25 +15759,25 @@ msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliqueu per enviar un correu a en/na %s"
 
 # fitxer: mail.ca.po.3
 #. 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 "Concordances: %d"
 
 # fitxer: mail.ca.po.3
-#: 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 "Sense signar"
 
 # fitxer: mail.ca.po.3
-#: 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."
@@ -15976,12 +15786,12 @@ msgstr ""
 "missatge sigui l'autèntic."
 
 # fitxer: mail.ca.po.3
-#: 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 "La signatura és vàlida"
 
 # fitxer: mail.ca.po.3
-#: 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."
@@ -15990,12 +15800,12 @@ msgstr ""
 "sigui el remitent."
 
 # fitxer: mail.ca.po.3
-#: 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 "La signatura no és vàlida"
 
 # fitxer: mail.ca.po.3
-#: 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."
@@ -16004,12 +15814,12 @@ msgstr ""
 "la transmissió."
 
 # fitxer: mail.ca.po.3
-#: 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 "La signatura és vàlida però no es pot verificar el remitent"
 
 # fitxer: mail.ca.po.3
-#: 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."
@@ -16018,12 +15828,12 @@ msgstr ""
 "verificar el remitent del missatge."
 
 # fitxer: mail.ca.po.3
-#: 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 "Sense xifrar"
 
 # fitxer: mail.ca.po.3
-#: 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."
@@ -16032,12 +15842,12 @@ msgstr ""
 "transport per internet."
 
 # fitxer: mail.ca.po.3
-#: 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 "Xifrat, feble"
 
 # fitxer: mail.ca.po.3
-#: 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 "
@@ -16049,12 +15859,12 @@ msgstr ""
 "raonable."
 
 # fitxer: mail.ca.po.3
-#: 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 "Xifrat"
 
 # fitxer: mail.ca.po.3
-#: 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."
@@ -16063,12 +15873,12 @@ msgstr ""
 "desconeguda visualitzi el contingut d'aquest missatge."
 
 # fitxer: mail.ca.po.3
-#: 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 "Xifrat, fort"
 
 # fitxer: mail.ca.po.3
-#: 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 "
@@ -16079,38 +15889,38 @@ msgstr ""
 "d'aquest missatge en una quantitat de temps raonable."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Visualitza el certificat"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "No es pot visualitzar aquest certificat"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completat el %d de %B del %Y, a les %H:%M"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Retardat:"
 
 # consulteu man 3 strftime per compendre aquest format
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pel %d de %B del %Y, a les %H:%M"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Visualitza inserit"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "A_maga"
 
@@ -16121,108 +15931,108 @@ msgid "Page %d of %d"
 msgstr "Pàgina %d de %d"
 
 # fitxer: mail.ca.po.3
-#: 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 "S'està obtenint '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "La part del cos externa està mal formada."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punter al lloc FTP (%s)"
 
 # fitxer: mail.ca.po.3
-#: 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 "Punter a un fitxer local (%s) vàlid al lloc '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punter al fitxer local (%s)"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punter a dades remotes (%s)"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punter a dades externes (tipus '%s')"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "S'està formatant el missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1406 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:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "De"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1406 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:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Respon"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1406 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:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1406 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
+#: 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"
 
 # fitxer: mail.ca.po.3
 #. pseudo-header
-#: mail/em-format-html.c:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Generador del correu"
 
 # fitxer: mail.ca.po.3
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a a les %R %Z)</I>"
 
 # fitxer: mail.ca.po.3
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
+#: 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 "Data"
 
-#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr ""
 
@@ -16319,25 +16129,25 @@ msgstr ""
 "Espereu mentres l'Evolution migra les vostres carpetes..."
 
 # fitxer: mail.ca.po.3
-#: 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 "No s'ha pogut migrar les memòries cau dels identificadors d'usuari: %s"
 
 # fitxer: mail.ca.po.3
-#: 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 "No s'ha pogut migrar l'estat d'expansió de la carpeta: %s"
 
 # fitxer: mail.ca.po.3
-#: 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 "No s'ha pogut crear el directori '%s': %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "No s'ha pogut obrir el magatzem per a '%s': %s"
@@ -16385,38 +16195,38 @@ msgid "Open in %s..."
 msgstr "Obre a %s..."
 
 # fitxer: mail.ca.po.3
-#: 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 "El magatzem no suporta subscripcions, o no estan habilitades."
 
 # fitxer: mail.ca.po.3
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Subscrit"
 
 # fitxer: mail.ca.po.3
-#: 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 "Carpeta"
 
 # fitxer: mail.ca.po.3
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:831
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Heu de seleccionar un servidor."
 
 # fitxer: mail.ca.po.3
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "No s'ha seleccionat cap missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "No tornis a mostrar aquest missatge."
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -16426,29 +16236,29 @@ msgstr ""
 "%s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtres"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Missatge reenviat --------"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "un/a remitent anònim/a"
 
 # fitxer: mail.ca.po.3
 #. 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 "El %A %d de %B del %Y a les %H:%M %%+05d, en/na %%s va escriure:"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -16458,7 +16268,7 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -16468,41 +16278,41 @@ msgstr ""
 "El voleu sobreescriure?"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "S'ha produït un error: '%s' existeix i no és un fitxer per a dades"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Desa el missatge..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Afegeix una adreça"
 
 # fitxer: mail.ca.po.2
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr "Missatges de %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -16516,7 +16326,7 @@ msgstr ""
 "Voleu suprimir aquests missatges?"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:2477
+#: 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"
@@ -16596,58 +16406,70 @@ msgstr "Alçada predeterminada de la finestra del redactor"
 msgid "Default height of the Message Window"
 msgstr "Amplada predeterminada de la finestra de missatge"
 
-# fitxer: mail.ca.po.3
+# fitxer: tools.ca.po
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Amplada predeterminada de la finestra de missatge"
+
+# fitxer: mail.ca.po.3
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Estil de resposta predeterminat"
 
 # fitxer: shell.ca.po
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Amplada predeterminada de la finestra del redactor"
 
 # fitxer: shell.ca.po
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Amplada predeterminada de la finestra de missatges"
 
+# fitxer: shell.ca.po
+#: mail/evolution-mail.schemas.in.in.h:19
+#, fuzzy
+msgid "Default width of the Subscribe dialog"
+msgstr "Amplada predeterminada de la finestra de missatges"
+
 # fitxer: mail.ca.po.3
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marca els errors ortogràfics a les paraules mentre escriviu."
 
 # fitxer: mail.ca.po.3
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Buida les papereres en sortir"
 
 # fitxer: mail.ca.po.3
-#: 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 "Buida les carpetes de paperera quan se surti de l'Evolution."
 
 # fitxer: mail.ca.po.3
-#: 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 ""
 "Habilita la modalitat de cursor, per veure un cursor quan es llegeixi el "
 "correu."
 
 # fitxer: mail.ca.po.3
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Habilita/inhabilita el mode de cursor"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Alçada de la subfinestra de la llista de missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Alçada de la subfinestra de la llista de missatges."
 
-#: 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 "
@@ -16658,20 +16480,20 @@ msgstr ""
 "un visualitzador bonobo-component en la base de dades de tipus mime del "
 "GNOME per visualitzar el contingut."
 
-#: 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:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "Llista d'etiquetes i els seus colors associats"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Llista de comptes"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: 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."
@@ -16680,11 +16502,11 @@ msgstr ""
 "llista conté cadenes referents a subdirectoris relatius a /apps/evolution/"
 "mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "Llista de capçaleres personalitzades i si estan habilitades."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: 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."
@@ -16693,15 +16515,15 @@ msgstr ""
 "llista conté cadenes de tipus nom:color, on color fa servir la codificació "
 "hexadecimal HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Llista de tipus mime pels que es cercarà components de visualització"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr "Carrega les imatges dels missatges HTML sobre http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: 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 - "
@@ -16712,92 +16534,92 @@ msgstr ""
 "remitent està a la llibreta d'adreces, 2 - carrega sempre les imatges"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Registra les accions del filtre"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "Registra les accions al fitxer de registre especificat."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Fitxer on registrar accions de filtre"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Fitxer on enregistrar accions de filtre."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Marca com a vist després del temps d'espera"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Marca com a vist després del temps d'espera."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marca les cites en la 'Previsualització' de missatge"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marca les cites en la 'Previsualització' de missatge."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Alçada predeterminada de la finestra de missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Amplada predeterminada de la finestra de missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Estil de visualització de missatges (normal, capçaleres senceres, font)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: 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:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "Fitxer de so de correu nou"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Tipus de notificació de correu nou"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Pregunta quan l'assumpte és buit"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pregunta l'usuari quan intenti buidar una contrasenya."
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: 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 "Pregunta quan l'usuari intenti enviar un missatge sense assumpte."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Pregunta quan l'usuari esborri"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Pregunta quan l'usuari només empleni Bcc"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:55
+#: 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."
@@ -16806,107 +16628,117 @@ msgstr ""
 "volen rebre correu HTML."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Pregunta quan l'usuari intenti enviar un missatge sense destinataris a Per a "
 "o Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pregunta quan l'usuari intenti enviar correu HTML no desitjat"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr "Reconeix els enllaços en el text i remplaça'ls."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconeix les caretes en el text i reemplaça-les per les seves imatges."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Executa una prova de brossa al correu d'entrada"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "0pc1ó s3cr3t4"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "0pc1ó s3cr3t4."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Envia els missatges en format HTML predeterminat"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Envia els missatges en format HTML predeterminat."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Mostra les animacions"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Mostra les imatges animades com a animacions."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Mostra els missatges suprimits en la llista de missatges (amb una ratlla a "
 "sobre)"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "Mostra els missatges suprimits en la llista de missatges"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Mostra la subfinestra 'Previsualització'"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Mostra la subfinestra 'Previsualització'."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Fitxer de so que es reprodueix quan arrivi nou correu."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Especifica el tipus de notificació de nou correu que l'usuari destija usar."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Comprovació ortogràfica al lloc"
 
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Alçada predeterminada de la finestra de missatges"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Amplada predeterminada de la finestra de missatges"
+
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Tipus de lletra de terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: 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:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "El tipus de lletra de terminal per visualitzar el correu"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "El tipus de lletra de mida variable per visualitzar el correu"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: 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;"
@@ -16919,103 +16751,103 @@ msgstr ""
 "visualitzar la capçalera en la visualització del correu."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Crea fils basats en la llista de missatges."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Crea fils basats en la llista de missatges"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "Crea fils basats en l'assumpte en la llista de missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Temps d'espera per marcar un missatge com a llegit."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Temps d'espera per marcar un missatge com a llegit."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Cadena d'identificació d'usuari del compte predeterminat."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usa el client i el dimoni Spamasssassin"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Usa el client i el dimoni Spamasssassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Utilitza els tipus de lletra personalitzats"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Utilitza el tipus de lletra personalitzat per visualitzar el correu"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Fes només proves de correu no desitjat locals."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Fes només proves de correu no desitjat locals (no DNS)."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Tipus de lletra de mida variable"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "L'element del menú Visualitza/Bcc està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "L'element del menú Visualitza/Bcc està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "L'element del menú Visualitza/Cc està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "L'element del menú Visualitza/Cc està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "L'element del menú Visualitza/Des de està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "L'element del menú Visualitza/Des de està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "L'element del menú Visualitza/Envia a està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "L'element del menú Visualitza/Envia a està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'element del menú Visualitza/Respon a està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'element del menú Visualitza/Respon a està activat."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: 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."
@@ -17023,12 +16855,12 @@ msgstr ""
 "Si s'ha de provar de crear fils per temes quan els missatges no continguin "
 "les capçaleres References o In-Reply-To."
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "port per iniciar l'spamd executat per l'usuari"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "port de l'spamd"
 
@@ -17072,7 +16904,7 @@ msgstr "L'Evolution està important el vostre antic correu Elm"
 #: 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 "S'està important..."
 
@@ -17080,7 +16912,7 @@ msgstr "S'està important..."
 #: 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 "Espereu"
 
@@ -17132,12 +16964,12 @@ msgid "Scanning %s"
 msgstr "S'està examinant %s"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtre de prioritat '%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"
@@ -17164,7 +16996,7 @@ msgstr ""
 "comptes de prioritats. Comproveu els filtres per assegurar-vos\n"
 "que tot funcioni apropiadament."
 
-#: 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"
@@ -17176,7 +17008,7 @@ msgstr ""
 "que no està suportada en l'Evolution.\n"
 "Aquests filtres es perdran."
 
-#: 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"
@@ -17190,26 +17022,26 @@ msgstr ""
 "modificar per provar si el cos del missatge conté\n"
 "o no la cadena."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "L'Evolution està important les vostres antigues dades del Netscape"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "S'està important dades del Netscape"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Configuració"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Filtres de correu"
 
-#: 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?"
@@ -17244,13 +17076,13 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr "No heu emplenat tota la informació necessària."
 
 # fitxer: mail.ca.po.2
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:145
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr "Editor de comptes de l'Evolution"
 
@@ -17269,7 +17101,7 @@ msgstr "_Nom d'usuari:"
 msgid "_Path:"
 msgstr "_Camí:"
 
-#: mail/mail-account-gui.c:2086
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "No podeu crear dos comptes amb el mateix nom."
 
@@ -17308,11 +17140,11 @@ msgstr "Respon a %s"
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Les següents regles de filtratge:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -17363,11 +17195,11 @@ msgid "URI of the mail source that the view will display"
 msgstr "La URI de l'origen de correu que mostarà la visualització"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitat"
 
-#: 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 "
@@ -17378,12 +17210,12 @@ msgstr ""
 "informació dins el correu que enviareu."
 
 # fitxer: mail.ca.po.2
-#: 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 "Rebre correu"
 
-#: 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."
@@ -17391,16 +17223,16 @@ msgstr ""
 "Introduïu informació sobre el vostre servidor d'entrada a sota. Si no "
 "n'esteu segur, pregunteu-ho a l'administrador del sistema o al vostre ISP."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Seleccioneu entre les següents opcions"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Enviar correu"
 
-#: 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."
@@ -17408,11 +17240,11 @@ msgstr ""
 "Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
 "pregunteu-ho a l'administrador del sistema o al vostre ISP."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestió de comptes"
 
-#: 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 "
@@ -17426,12 +17258,12 @@ msgstr ""
 "Introduïu un nom per a aquest compte a l'espai de sota. Aquest nom només "
 "s'utilitzarà per visualitzar-lo."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Comprovació del servei"
 
 # fitxer: mail.ca.po.2
-#: 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 "S'està connectant al servidor..."
 
@@ -18203,7 +18035,7 @@ msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -18213,7 +18045,7 @@ msgstr ""
 "%s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -18223,7 +18055,7 @@ msgstr ""
 "%s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "S'està treballant"
 
@@ -18464,82 +18296,82 @@ msgid "Security Information"
 msgstr "Informació sobre seguretat"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "S'està cancel·lant..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, tipus: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Camí: %s, tipus: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Tipus: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Envia i reb el correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "C_ancel·la-ho tot"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "S'està actualitzant..."
 
 # fitxer: mail.ca.po.1
-#: 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 "S'està esperant..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "L'usuari ha cancel·lat l'operació."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduïu la contrasenya per a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Recorda aquesta contrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recorda aquesta contrasenya durant aquesta sessió"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "No s'ha pogut desar el fitxer de signatura: %s"
 
 # fitxer: mail.ca.po.1
-#: 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"
@@ -18550,27 +18382,27 @@ msgstr ""
 "Voleu desar-ne els canvis?"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Descarta els canvis"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Desa la signatura"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Edita la signatura"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Introduïu un nom per a aquesta signatura."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nom:"
 
@@ -18603,19 +18435,19 @@ msgid "Invalid folder: `%s'"
 msgstr "La carpeta no és vàlida: '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'està configurant la vfolder: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "S'està actualitzant les vfolders per a la uri: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -18629,103 +18461,103 @@ msgstr ""
 "I s'han actualitzat."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vFolders"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Edita la VFolder"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "S'està intentant editar una vfolder '%s' que inexistent."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "No vist"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Vist"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Respost"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples missatges sense veure"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Missatges múltiples"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Molt baixa"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Abaixa"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Alta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Molt alta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "Avui a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Ahir a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "el %d de %b a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr "%d de %b del %Y"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "S'està generant la llista de missatges"
 
@@ -19089,7 +18921,7 @@ msgid "Choose the destination for this import"
 msgstr "Escolliu la destinació per a aquesta importació"
 
 # fitxer: shell.ca.po
-#: 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 "Seleccioneu la informació que voleu importar:"
 
@@ -19122,30 +18954,30 @@ msgid "Select importer"
 msgstr "Seleccioneu l'importador"
 
 # fitxer: shell.ca.po
-#: 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 "El fitxer %s no existeix"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "S'està important"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "S'està important %s.\n"
 
 # fitxer: shell.ca.po
-#: 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 "S'ha produït un error en carregar %s"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -19155,37 +18987,37 @@ msgstr ""
 "S'està important l'element 1."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automàtic"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "Nom del _fitxer:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Tipus de fitxer:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Importa dades i paràmetres de pr_ogrames més antics"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Impo_rta un únic fitxer"
 
 # fitxer: shell.ca.po
-#: 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"
@@ -19194,29 +19026,29 @@ msgstr ""
 "S'està cercant configuracions prèvies"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "S'estan iniciant els importadors intel·ligents"
 
 # fitxer: shell.ca.po
-#: 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 "De %s:"
 
 # fitxer: camel.ca.po.3
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No hi ha cap importador disponible per al fitxer %s"
 
 # fitxer: camel.ca.po.4
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "No s'ha pogut executar l'importador"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importa"
 
@@ -19267,12 +19099,12 @@ msgid "Cannot find the specified shared folder."
 msgstr "No s'ha pogut trobar la carpeta compartida especificada."
 
 # fitxer: mail.ca.po.2
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "S'està iniciant la importació"
 
 # fitxer: shell.ca.po
-#: 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 "
@@ -19415,7 +19247,6 @@ msgstr "Quadre de verificació"
 # fitxer: shell.ca.po
 #: 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 "Nou"
 
@@ -19476,18 +19307,19 @@ msgstr "Crea un nou element de prova"
 
 # fitxer: shell.ca.po
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Connexions actives"
 
 # fitxer: shell.ca.po
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Cliqueu 'D'acord' per tancar aquestes connexions i desconnectar-se"
+msgid "Active Connections"
+msgstr "Connexions actives"
 
 # fitxer: shell.ca.po
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Les següents connexions estan actives en aquest moment:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Cliqueu 'D'acord' per tancar aquestes connexions i desconnectar-se"
 
 # fitxer: shell.ca.po
 #: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -19630,33 +19462,33 @@ msgstr ""
 "per importar fitxers externs a l'Evolution."
 
 # fitxer: shell.ca.po
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importadors"
 
 # fitxer: shell.ca.po
-#: 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 "Importa"
 
 # fitxer: shell.ca.po
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "No importis"
 
 # fitxer: shell.ca.po
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "No m'ho tornis a preguntar"
 
 # fitxer: shell.ca.po
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "L'Evolution pot importar les dades dels fitxers següents:"
 
 # fitxer: shell.ca.po
 #. 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"
@@ -19694,7 +19526,7 @@ msgstr ""
 "ansiosament les vostres contribucions!\n"
 
 # fitxer: shell.ca.po
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -19703,58 +19535,58 @@ msgstr ""
 "L'equip del Ximian Evolution\n"
 
 # fitxer: shell.ca.po
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "No m'ho tornis a dir"
 
 # fitxer: shell.ca.po
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No s'ha pogut accedir l'intèrpret d'ordres del Ximian Evolution."
 
 # fitxer: shell.ca.po
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 "No s'ha pogut inicialitzar l'intèrpret d'ordres del Ximian Evolution: %s"
 
 # fitxer: shell.ca.po
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
 # fitxer: shell.ca.po
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Inicia desconnectat"
 
 # fitxer: shell.ca.po
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Inicia connectat"
 
 # fitxer: shell.ca.po
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Força l'aturada de tots els components de l'Evolution"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Força tornar a migrar des de l'Evolution 1.4"
 
 # fitxer: shell.ca.po
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de la depuració de tots els components a un fitxer."
 
 # fitxer: shell.ca.po
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "Evolution"
 
 # fitxer: shell.ca.po
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20399,7 +20231,7 @@ msgid "Move to Folder..."
 msgstr "Mou a la carpeta..."
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: 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 "Enganxa el porta-retalls"
 
@@ -20411,7 +20243,7 @@ msgstr "Previsualitza els contactes que s'ha d'imprimir"
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
 #: 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 "Pre_visualització d'impressió"
 
@@ -20471,13 +20303,13 @@ msgid "View the current contact"
 msgstr "Visualitza el contacte actual"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: 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 "_Accions"
 
@@ -20503,16 +20335,11 @@ msgstr "De_sa com a VCard"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "Cerca contacte_s"
-
-# fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Selecciona-ho tot"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Envia un _missatge al contacte..."
 
@@ -20522,70 +20349,65 @@ msgid "Day"
 msgstr "Dia"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Suprimeix tots els esdeveniments"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Suprimeix la cita"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Suprimeix aquest esdeveniment"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Suprimeix aquest esdeveniment"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Vés a"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Vés endarrere"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Vés endavant"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Vés a una _data"
-
-# fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Vés a una data concreta"
-
-# fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Vés a avui"
-
-# fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Llista"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mes"
 
+# fitxer: ui.evolution-mail-message.xml.h.ca.po
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Següent"
+
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el calendari que s'ha d'imprimir"
 
+# fitxer: ui.evolution-mail-message.xml.h.ca.po
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Anterior"
+
 # fitxer: ui.evolution-calendar.xml.h.ca.po
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
@@ -20597,7 +20419,7 @@ msgid "Publish Free/Busy information for this calendar"
 msgstr "Publica la informació quant a l'ocupació per a aquest calendari"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: 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 "Bui_da"
 
@@ -20606,43 +20428,67 @@ msgstr "Bui_da"
 msgid "Purge old appointments and meetings"
 msgstr "Buida les cites i reunions antigues"
 
-# fitxer: ui.evolution-calendar.xml.h.ca.po
+# fitxer: ui.evolution-composer-entries.xml.h.ca.po
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Selecciona tot el text"
+
+# fitxer: ui.evolution-calendar.xml.h.ca.po
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Vés a una data concreta"
+
+# fitxer: mail.ca.po.3
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Seleccioneu una carpeta"
+
+# fitxer: ui.evolution-calendar.xml.h.ca.po
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Mostra com a llista"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Mostra un dia"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Mostra un mes"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Mostra una setmana"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Mostra la setmana actual"
 
+# fitxer: widgets.ca.po
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Avui"
+
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Visualitza la cita"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Setmana"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Obre una cita:"
 
@@ -21316,11 +21162,6 @@ msgid "Move selected message(s) to another folder"
 msgstr "Mou els missatges seleccionats a una altra carpeta"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Següent"
-
-# fitxer: ui.evolution-mail-message.xml.h.ca.po
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Següent m_issatge important"
@@ -21381,11 +21222,6 @@ msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'imprimirà"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Anterior"
-
-# fitxer: ui.evolution-mail-message.xml.h.ca.po
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Imprimeix aquest missatge"
@@ -21897,47 +21733,47 @@ msgid "Cut selected task"
 msgstr "Retalla la tasca seleccionada"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Suprimeix les tasques completades"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Suprimeix la tasca seleccionada"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Mar_ca com a completa"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Marca la tasca seleccionada com a completa"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Enganxa la tasca del porta-retalls"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Previsualitza la llista de tasques que s'ha d'imprimir"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Imprimeix la llista de tasques"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Visualitza la tasca seleccionada"
 
 # fitxer: ui.evolution-tasks.xml.h.ca.po
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Obre una tasca"
 
@@ -22096,13 +21932,19 @@ msgstr "Visualització d_e setmana"
 msgid "_Day View"
 msgstr "Visualització _de dia"
 
-# fitxer: views.ca.po
+# fitxer: calendar.ca.po.5
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Visualització de la llista"
+
+# fitxer: views.ca.po
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Visualització de _més"
 
 # fitxer: views.ca.po
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Visualització de _setmana"
 
@@ -22136,13 +21978,20 @@ msgstr "Pel sen_yalador de respondre"
 msgid "_Messages"
 msgstr "_Missatges"
 
-# fitxer: views.ca.po
+# fitxer: calendar.ca.po.3
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Amb la _categoria"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Data de venciment:"
 
-# fitxer: views.ca.po
+# fitxer: filter.ca.po
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Defineix l'estat"
+
+# fitxer: views.ca.po
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasques"
 
@@ -22218,11 +22067,6 @@ msgid "Now"
 msgstr "Ara"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Avui"
-
-# fitxer: widgets.ca.po
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -22234,100 +22078,106 @@ msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdòs inclosos"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Bàltic"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Europeu central"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Xinès"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Grec"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebreu"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japonès"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Coreà"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turc"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Unicode"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Europeu occidental"
 
 # fitxer: widgets.ca.po
-#: 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 "Europeu occidental"
+
+# fitxer: widgets.ca.po
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradicional"
 
 # fitxer: widgets.ca.po
-#: 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 "Simplificat"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Visual"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunt de caràcters desconegut: %s"
 
 # fitxer: widgets.ca.po
-#: 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 "Codificació dels caràcters"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Introduïu el joc de caràcters que s'utilitzarà"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Altres..."
 
@@ -22408,6 +22258,12 @@ msgid "Spacing around expander arrow"
 msgstr "Espaiat al voltant de la fletxa de l'expansor"
 
 # fitxer: widgets.ca.po
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Cerca"
+
+# fitxer: widgets.ca.po
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Editor de cerques"
@@ -22485,6 +22341,169 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Address Book Sources"
+#~ msgstr "Fonts de la llibreta d'adreces"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Selected:"
+#~ msgstr "Seleccionats:"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "Go To Date"
+#~ msgstr "Vés a una data"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "_Go To Today"
+#~ msgstr "_Vés a avui"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Unexpected response from IMAP server %s: %s"
+#~ msgstr "Resposta inesperada del servidor IMAP: %s"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#, fuzzy
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "El servidor s'ha desconnectat inesperadament: %s"
+
+# fitxer: camel.ca.po.2
+#, fuzzy
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
+
+# fitxer: camel.ca.po.1
+#, fuzzy
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "No es pot connectar amb el servidor POP %s. No se suporta el mecanisme "
+#~ "d'autenticació sol·licitat."
+
+# fitxer: camel.ca.po.1
+#, fuzzy
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%sIntroduïu la contrasenya SMTP per a %s a la màquina %s"
+
+# fitxer: camel.ca.po.1
+#, fuzzy
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#, fuzzy
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "No s'ha pogut suprimir la carpeta: %s. La carpeta no existeix"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#, fuzzy
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#, fuzzy
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#, fuzzy
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Resposta inesperada del servidor IMAP: %s"
+
+# fitxer: filter.ca.po
+#, fuzzy
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "Regles del filtre"
+
+# fitxer: filter.ca.po
+#~ msgid "Edit Filters"
+#~ msgstr "Edita els filtres"
+
+# fitxer: filter.ca.po
+#~ msgid "Edit VFolders"
+#~ msgstr "Edita les VFolders"
+
+# fitxer: filter.ca.po
+#~ msgid "Outgoing"
+#~ msgstr "Sortida"
+
+# fitxer: mail.ca.po.3
+#~ msgid "[script]"
+#~ msgstr "[seqüència]"
+
+# fitxer: mail.ca.po.3
+#~ msgid "Add script signature"
+#~ msgstr "Afegeix una signatura de seqüència"
+
+# fitxer: shell.ca.po
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Les següents connexions estan actives en aquest moment:"
+
+# fitxer: ui.evolution-addressbook.xml.h.ca.po
+#~ msgid "_Search for Contacts"
+#~ msgstr "Cerca contacte_s"
+
+# fitxer: ui.evolution-calendar.xml.h.ca.po
+#~ msgid "Go to _Date"
+#~ msgstr "Vés a una _data"
+
+# fitxer: ui.evolution-calendar.xml.h.ca.po
+#~ msgid "Go to today"
+#~ msgstr "Vés a avui"
+
+# fitxer: views.ca.po
+#~ msgid "With _Category"
+#~ msgstr "Amb la _categoria"
+
 # fitxer: addressbook.gui.widgets.ca.po
 #~ msgid "1 contact"
 #~ msgstr "1 contacte"
@@ -22493,10 +22512,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "and %d other contacts."
 #~ msgstr "i d'altres %d contactes."
 
-# fitxer: calendar.ca.po.5
-#~ msgid "List View"
-#~ msgstr "Visualització de la llista"
-
 # fitxer: calendar.ca.po.4
 #~ msgid "1 day"
 #~ msgstr "1 dia"
diff --git a/po/cs.po b/po/cs.po
index a45b236c18..e7058440be 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-31 19:13+0200\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-31 22:13+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.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=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
@@ -84,7 +84,6 @@ msgstr "Zde nastavte automatické dokončování"
 #. 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
@@ -133,17 +132,18 @@ msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresář '%s' bude odstraněn. Jste si jisti, že chcete pokračovat?"
 
 #: addressbook/gui/component/addressbook-component.c:313
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "Nový adresář"
 
 #: addressbook/gui/component/addressbook-component.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: 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:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: 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 "Odstranit"
 
@@ -152,55 +152,70 @@ msgstr "Odstranit"
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Vytvořit nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:566
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Nový seznam kontaktů"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "Seznam kon_taktů"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Vytvořit nový seznam kontaktů"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Nový adresář"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Adresář"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Vytvořit nový úkol"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Nemohu se připojit k serveru LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nemohu se autentizovat u serveru LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Nemohu se dotázat na kořenový 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 "V odpovědi serveru nejsou podporované základy vyhledávání"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tento server nepodporuje schéma informací LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Chyba při načítání informací o schématu"
 
-#: 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 neodpověděl platnou informací o schématu"
 
@@ -228,7 +243,6 @@ msgid "Migrating `%s':"
 msgstr "Převádím `%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:430 calendar/gui/migration.c:513
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
@@ -237,12 +251,9 @@ msgid "On This Computer"
 msgstr "V tomto počítači"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Osobní"
@@ -297,7 +308,7 @@ msgstr "Obsluha tohoto adresáře odmítla provést tento dotaz."
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebyl úspěšně dokončen."
 
-#: 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."
@@ -305,7 +316,7 @@ msgstr ""
 "Nemohu otevřít tento adresář. Ověřte prosím, že cesta existuje a že máte "
 "oprávnění k němu přistupovat."
 
-#: 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."
@@ -313,7 +324,7 @@ msgstr ""
 "Nemohu otevřít tento adresář. To znamená, že jste buď zadali nesprávné URI "
 "nebo že server LDAP není dostupný."
 
-#: 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 "
@@ -323,7 +334,7 @@ msgstr ""
 "LDAP v Evolution používat, musíte program překompilovat z CVS po získání "
 "OpenLDAP z níže uvedeného odkazu."
 
-#: 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."
@@ -331,28 +342,28 @@ msgstr ""
 "Nemohu otevřít tento adresář. To znamená, že jste buď zadali nesprávné URI "
 "nebo že server LDAP není dostupný."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Nemohu otevřít adresář"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "K serveru LDAP se přistupuje anonymně"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Nemohu se autentizovat.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadejte heslo pro %s (uživatel %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 zdroje kontaktů, které bude pohled zobrazovat"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "URI, které bude zobrazovat adresář"
 
@@ -377,15 +388,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI složky naposledy používané v dialogu výběru jmen"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  Zo_brazit podporované základy "
 
-#: 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
@@ -407,52 +413,44 @@ msgstr "  Zo_brazit podporované základy "
 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 "Asistent pro tvorbu adresáře"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresáře"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Zdroje adresáře"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Vždy"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonymně"
 
-#: 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"
@@ -464,51 +462,51 @@ msgstr ""
 "Nastavení, která jste zde zadali, prosím uložte kliknutím na tlačítko "
 "\"Použít\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Připojení"
 
-#: 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 "E-mailová adresa:"
 
-#: 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 bude používat toto DN k vaší autentizaci u serveru"
 
-#: 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 bude používat tuto e-mailovou adresu k vaší autentizaci u serveru"
 
-#: 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 "Ukončeno"
 
-#: 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 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Obecné"
 
-#: 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 "Skupina:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikdy"
 
-#: 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"
@@ -524,23 +522,19 @@ msgstr ""
 "Zeptejte se svého systémového administrátora, zda váš LDAP server používá "
 "tyto protokoly. "
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "_Rozsah vyhledávání: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Vyhledávání"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Vybráno:"
-
-#: 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"
@@ -549,7 +543,7 @@ msgstr ""
 "Po výběru této volby se Evolution k serveru LDAP připojí pouze tehdy,\n"
 "pokud LDAP server podporuje SSL nebo 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"
@@ -566,7 +560,7 @@ msgstr ""
 "v práci za firewallem, není třeba použít SSL/TLS, protože spojení je již "
 "bezpečné."
 
-#: 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"
@@ -579,7 +573,7 @@ msgstr ""
 "že vaše spojení nebude zabezpečené a můžete se stát terčem bezpečnostního "
 "útoku."
 
-#: 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 "
@@ -590,7 +584,7 @@ msgstr ""
 "vyhledávání\n"
 "v LDAP a pro vytváření a úpravu kontaktů."
 
-#: 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"
@@ -598,32 +592,32 @@ msgid ""
 msgstr ""
 "Zadání zobrazovaného názvu a skupiny je první krok při nastavování adresáře."
 
-#: 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 "Krok 1: Charakteristiky složky"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Krok 2: Informace o serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Krok 3: Připojení k serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Krok 4: Prohledávání adresáře"
 
-#: 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 "Podporované základy vyhledávání"
 
-#: 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"
@@ -636,7 +630,7 @@ msgstr ""
 "a jak dlouho by mělo trvat. Pokud potřebujete tyto volby změnit,\n"
 "požádejte svého systémového administrátora."
 
-#: 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"
@@ -647,7 +641,7 @@ msgstr ""
 "vaše hledání. Pokud je ponecháte prázdné, prohledávání začne v kořeni "
 "adresářového stromu."
 
-#: 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"
@@ -662,7 +656,7 @@ msgstr ""
 "Rozsah vyhledávání \"jeden\" zahrnuje záznamy jednu úroveň pod základem "
 "vyhledávání.\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"
@@ -677,14 +671,14 @@ msgstr ""
 "další parametry. Pokud potřebujete pomoc s nalezením těchto\n"
 "informací, kontaktujte prosím svého správce systému."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Toto je plný název vašeho LDAP serveru. Například  \"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"
@@ -694,7 +688,7 @@ msgstr ""
 "příliš\n"
 "vysoké, zpomalí se váš adresář."
 
-#: 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 "
@@ -704,7 +698,7 @@ msgstr ""
 "že použití volby \"E-mailová adresa\" vyžaduje anonymní přístup k serveru "
 "LDAP."
 
-#: 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"
@@ -714,7 +708,7 @@ msgstr ""
 "Evolution.\n"
 "Je pouze pro zobrazování."
 
-#: 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 "
@@ -723,7 +717,7 @@ msgstr ""
 "Toto je název, který se objeví ve vašem seznamu složek Evolution. Je pouze "
 "pro zobrazování."
 
-#: 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"
@@ -734,28 +728,28 @@ msgstr ""
 "Seznam standardních portů je předvyplněn. Váš správce systému vám sdělí,\n"
 "které číslo portu máte zadat."
 
-#: 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 "Tato volba určuje, jak dlouho poběží hledání."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Použít _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Použít distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Použít e-mailovou adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kdykoliv je možné"
 
-#: 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"
@@ -766,60 +760,48 @@ msgstr ""
 "informace o vašem přihlášení.\n"
 "Pokud si nejste jisti, zeptejte se prosím svého správce systému."
 
-#: 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 "Zobrazovaný _název:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Omezení stahování:"
 
-#: 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:17
-#: mail/mail-config.glade.h:160 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 "_Upravit"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Metoda přihlášení:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "Číslo _portu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Základ vyhledávání:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Název _serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Prodleva (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "připojovací-karta"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "obecný přehled"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "vyhledávací přehled"
 
@@ -867,7 +849,7 @@ msgstr "Jméno"
 
 #: 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 "Zdroj"
 
@@ -934,7 +916,8 @@ msgstr "Spolupráce"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Editor kontaktů"
 
@@ -1030,13 +1013,24 @@ msgstr "Ka_tegorie..."
 #: 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:2503 mail/em-folder-view.c:765
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Odstranit"
 
+#: 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 "_Upravit"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Domů:"
@@ -2074,7 +2068,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:2813
+#: 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"
@@ -2089,7 +2083,7 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2816
+#: 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"
@@ -2112,22 +2106,22 @@ msgid "Username"
 msgstr "Jméno uživatele"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2481
-#: addressbook/gui/contact-editor/e-contact-editor.c:2777
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Domů"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2781
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: 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 "Pracovní"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2482
-#: addressbook/gui/contact-editor/e-contact-editor.c:2785
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Další"
 
@@ -2162,45 +2156,45 @@ msgstr "Změněno"
 msgid "Account Name"
 msgstr "Název účtu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1463
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Editor kategorie není dostupný"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1471
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patří do těchto kategorií"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1695
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Uložit kontakt jako VCard?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2480
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Práce"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: 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:2814
+#: 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:2815
+#: 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:2817
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nemohu najít widget pro pole: `%s'"
@@ -2355,6 +2349,10 @@ msgstr "Služba _IM:"
 msgid "_Location:"
 msgstr "_Místo:"
 
+#: 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 "Členové"
@@ -2378,7 +2376,7 @@ msgstr "editor-seznamu-kontaktů"
 #: 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"
@@ -2390,6 +2388,7 @@ msgstr "Nový seznam"
 
 #. Construct the app
 #: 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 "Editor seznamu kontaktů"
 
@@ -2454,7 +2453,7 @@ msgstr[2] "%d kontaktů"
 
 #: 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"
@@ -2472,30 +2471,31 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Chyba při úpravě karty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Jméno začíná na"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "E-mail začíná na"
 
-#: 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 "Kategorie je"
 
 #. 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 "Jakékoliv políčko obsahuje"
 
-#: 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 "Pokročilé..."
 
-#: 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:12
 #: calendar/gui/e-meeting-list-view.c:249
@@ -2503,95 +2503,96 @@ msgstr "Pokročilé..."
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Adresář"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Uložit jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Nový kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Nový seznam kontaktů..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Jít do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importovat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Hledat kontakty..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Zdroje adresáře..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Předběžná nastavení..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Přeposlat kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Poslat kontaktu zprávu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "Tisknout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Tisknout obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Zkopírovat do adresáře..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Přesunout do adresáře..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: 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 "Kopírovat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: 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 "Vložit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 #: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Aktuální zobrazení"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2603,7 +2604,7 @@ msgstr ""
 "spadla. Pokud jej chcete znovu použít, musíte znovu spustit Evolution."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Jakákoliv kategorie"
@@ -2913,7 +2914,6 @@ msgstr "Úspěch"
 #: 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/imap4/camel-imap-store.c:288
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
@@ -3138,17 +3138,17 @@ msgstr "Zobrazení karty"
 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 "Test přeformátování"
 
-#: 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 © 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 "Toto by mělo otestovat položku canvasu přeformátování"
 
@@ -3831,7 +3831,7 @@ msgid "Purge events older than"
 msgstr "Vyčistit události starší než"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "dnů"
 
@@ -3841,10 +3841,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -3878,60 +3874,60 @@ msgstr "Kalendář '%s' bude odstraněn. Jste si jisti, že chcete pokračovat?"
 msgid "New Calendar"
 msgstr "Nový kalendář"
 
-#: calendar/gui/calendar-component.c:928
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Nová událost"
 
-#: calendar/gui/calendar-component.c:929
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Událost"
 
-#: calendar/gui/calendar-component.c:930
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Vytvořit novou událost"
 
-#: calendar/gui/calendar-component.c:935
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Nová schůzka"
 
-#: calendar/gui/calendar-component.c:936
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Schůzka"
 
-#: calendar/gui/calendar-component.c:937
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Vytvořit požadavek na novou schůzku"
 
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Nová celodenní událost"
 
-#: calendar/gui/calendar-component.c:943
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "_Celodenní událost"
 
-#: calendar/gui/calendar-component.c:944
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Vytvořit novou celodenní událost"
 
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Nový kalendář"
 
-#: calendar/gui/calendar-component.c:950
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "Kalen_dář"
 
-#: calendar/gui/calendar-component.c:951
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Vytvořit nový kalendář"
 
-#: calendar/gui/calendar-component.c:1018
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nemohu otevřít kalendář '%s' pro tvorbu událostí a schůzek"
 
-#: calendar/gui/calendar-component.c:1030
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Není k dispozici kalendář pro tvorbu událostí a schůzek"
 
@@ -4051,11 +4047,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "krát navíc každých"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hodin"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "minut"
 
@@ -4141,8 +4137,8 @@ msgstr "začátkem(-ku) události"
 
 #. 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:493
-#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
+#: 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 "Povoleno"
 
@@ -4156,19 +4152,19 @@ msgstr "Neodstraňovat"
 
 #: 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:399
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Zakázat"
 
 #: 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:401
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Povolit"
 
@@ -4312,7 +4308,7 @@ msgid "Wednesday"
 msgstr "středa"
 
 #: 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 "Pracovní týden"
 
@@ -4668,7 +4664,7 @@ msgstr "Není shrnutí"
 
 #: 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:1145
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Uložit jako..."
 
@@ -4926,16 +4922,11 @@ msgid "_Start time:"
 msgstr "_Začátek:"
 
 #. 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:2083
-#: mail/em-account-prefs.c:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: 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:443
@@ -5174,7 +5165,7 @@ msgid "_No recurrence"
 msgstr "_Bez opakování"
 
 #: 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 "_Odstranit"
 
@@ -5216,7 +5207,7 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1562
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
 msgid "_Discard Changes"
 msgstr "Za_hodit změny"
 
@@ -5278,7 +5269,7 @@ msgstr "Dokončeno"
 
 #: 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 "Vysoká"
 
@@ -5291,13 +5282,13 @@ msgstr "Probíhá"
 
 #: 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 "Nízká"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Normální"
 
@@ -5593,14 +5584,9 @@ msgstr "Ne"
 #: 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/imap4/camel-imap-engine.c:1525
-#: camel/providers/imap4/camel-imap-engine.c:1552
-#: camel/providers/imap4/camel-imap-engine.c:1582
-#: camel/providers/imap4/camel-imap-engine.c:1622
-#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
-#: 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 "Neznámá"
 
@@ -5684,9 +5670,9 @@ msgstr "_Uložit jako..."
 #: 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:39 ui/evolution-comp-editor.xml.h:19
+#: 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:23
+#: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Tisknout..."
 
@@ -5699,17 +5685,17 @@ msgstr "_Vyjmout"
 
 #: 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:2496 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
+#: 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 "_Kopírovat"
 
 #: 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:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
+#: 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 "V_ložit"
 
@@ -5744,7 +5730,7 @@ msgid "% Complete"
 msgstr "% hotovo"
 
 #: 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:597
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Dokončeno"
 
@@ -5784,7 +5770,7 @@ msgstr "Nová schůzka"
 msgid "New Task"
 msgstr "Nový úkol"
 
-#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:22
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Zvolit _dnešek"
 
@@ -5792,7 +5778,7 @@ msgstr "Zvolit _dnešek"
 msgid "_Select Date..."
 msgstr "_Zvolit datum..."
 
-#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Zveřejnit informaci o volném/obsazeném čase"
 
@@ -5833,20 +5819,12 @@ msgid "_Settings..."
 msgstr "Na_stavení..."
 
 #. 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"
@@ -5870,10 +5848,6 @@ msgstr "%02i rozdělení minuty"
 
 #. 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:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5881,9 +5855,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6081,7 +6052,7 @@ msgid "Send Latest Information"
 msgstr "Poslat nejnovější informace"
 
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušit"
@@ -6445,10 +6416,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
@@ -6457,10 +6424,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6544,12 +6507,12 @@ msgstr "Naléhavost:"
 msgid "Web Page:"
 msgstr "WWW stránka:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím sem otevřete %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6600,32 +6563,32 @@ msgstr "Mažu vybrané objekty..."
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/gnome-cal.c:1758
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Načítám události v %s"
 
-#: calendar/gui/gnome-cal.c:1777
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Načítám úkoly v %s"
 
-#: calendar/gui/gnome-cal.c:1797
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Otevírám %s"
 
-#: calendar/gui/gnome-cal.c:1926
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "Obsluha kalendáře pro '%s'spadla."
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1940
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr "Obsluha úkolů pro '%s' spadla."
 
-#: calendar/gui/gnome-cal.c:2752
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Čistím"
 
@@ -8900,7 +8863,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Zrušeno"
 
@@ -9273,7 +9236,7 @@ msgstr "Odkazované údaje vypršely."
 #: 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:1198
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpověď autentizace od serveru."
 
@@ -9467,29 +9430,29 @@ msgstr "Chyba při zpracování"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Podepisující: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nemohu získat složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-store.c:242
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nemohu vytvořit složku `%s': složka existuje"
 
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nemohu vytvořit složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-store.c:377 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 "Nemohu odstranit složku: %s: Neplatná operace"
 
-#: camel/camel-store.c:773 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Koš"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: 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"
@@ -9803,12 +9766,12 @@ msgstr "Seznam"
 #: 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:2984
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operace zrušena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2987
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočekávaně zrušil spojení: %s"
@@ -9976,22 +9939,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pro čtení a ukládání pošty na IMAP serverech."
 
-#: camel/providers/imap/camel-imap-store.c:425
-#: camel/providers/imap4/camel-imap-store.c:166
+#: 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:427
-#: camel/providers/imap4/camel-imap-store.c:168
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP služba pro %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap-store.c:209
-#: camel/providers/imap4/camel-imap-store.c:226
+#: 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
@@ -10001,16 +9960,14 @@ msgstr "IMAP služba pro %s na %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nemohu se připojit k %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap-store.c:211
+#: 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 není k dispozici"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:801
-#: camel/providers/imap4/camel-imap-store.c:223
+#: 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
@@ -10018,50 +9975,49 @@ msgstr "SSL není k dispozici"
 msgid "Connection cancelled"
 msgstr "Spojení zrušeno"
 
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/imap4/camel-imap-store.c:287
+#: 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 "Nemohu se připojit k serveru IMAP %s v zabezpečeném režimu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:636
+#: 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 rozšíření není podporováno."
 
-#: camel/providers/imap/camel-imap-store.c:667
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Vyjednávání SSL selhalo"
 
-#: camel/providers/imap/camel-imap-store.c:804
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nemohu se připojit příkazem \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1228
+#: 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 nepodporuje požadovaný typ autentizace %s"
 
-#: camel/providers/imap/camel-imap-store.c:1238
+#: 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 "Typ autentizace %s není podporován"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: 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 "%sUveďte IMAP heslo pro %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Neuvedli jste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1304
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10072,21 +10028,20 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1791
-#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Složka %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1802
-#: camel/providers/imap/camel-imap-store.c:2091
-#: camel/providers/imap4/camel-imap-store.c:636
+#: 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 "Název složky \"%s\" je neplatný, protože obsahuje znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: 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
@@ -10094,124 +10049,15 @@ msgstr "Název složky \"%s\" je neplatný, protože obsahuje znak \"%c\""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nemohu vytvořit složku `%s': složka existuje."
 
-#: camel/providers/imap/camel-imap-store.c:2103
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámá rodičovská složka: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2153
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovská složka nemůže obsahovat podsložky"
 
-#: camel/providers/imap4/camel-imap-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP server %s: %s"
-msgstr "Neočekávaná odpověď od IMAP serveru %s: %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:411
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nemohu odstranit složku '%s': Neplatný název schránky"
-
-#: camel/providers/imap4/camel-imap-engine.c:417
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nemohu zvolit složku `%s': Špatný příkaz"
-
-#: camel/providers/imap4/camel-imap-engine.c:1135
-#: camel/providers/imap4/camel-imap-engine.c:1524
-#: camel/providers/imap4/camel-imap-engine.c:1551
-#: camel/providers/imap4/camel-imap-engine.c:1581
-#: camel/providers/imap4/camel-imap-engine.c:1621
-#: camel/providers/imap4/camel-imap-utils.c:289
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s se neočekávaně odpojil: %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:1136
-msgid "Got BYE response"
-msgstr "Dostal jsem odpověď BYE"
-
-#: camel/providers/imap4/camel-imap-store.c:262
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nemohu se připojit k serveru IMAP %s v zabezpečeném režimu: Server "
-"nepodporuje STARTLS"
-
-#: camel/providers/imap4/camel-imap-store.c:374
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nemohu se autentizovat u IMAP serveru %s pomocí mechanismu autentizace %s"
-
-#: camel/providers/imap4/camel-imap-store.c:419
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sZadejte prosím heslo IMAP pro %s na počítači %s"
-
-#: camel/providers/imap4/camel-imap-store.c:493
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nemohu se autentizovat u IMAP serveru %s pomocí %s"
-
-#: camel/providers/imap4/camel-imap-store.c:672
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nemohu přejmenovat složku `%s': Neplatný název schránky"
-
-#: camel/providers/imap4/camel-imap-store.c:677
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nemohu vytvořit složku `%s': Špatný příkaz"
-
-#: camel/providers/imap4/camel-imap-store.c:699
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nemohu odstranit složku `%s': Speciální složka"
-
-#: camel/providers/imap4/camel-imap-store.c:728
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nemohu odstranit složku `%s': Neplatný název schránky"
-
-#: camel/providers/imap4/camel-imap-store.c:733
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nemohu odstranit složku `%s': Špatný příkaz"
-
-#: camel/providers/imap4/camel-imap-store.c:791
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nemohu se přihlásit ke složce `%s': Neplatný název schránky"
-
-#: camel/providers/imap4/camel-imap-store.c:796
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nemohu se přihlásit ke složce `%s': Špatný příkaz"
-
-#: camel/providers/imap4/camel-imap-store.c:835
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nemohu se odhlásit od složky `%s': Neplatný název schránky"
-
-#: camel/providers/imap4/camel-imap-store.c:840
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nemohu se odhlásit od složky `%s': Špatný příkaz"
-
-#: camel/providers/imap4/camel-imap-utils.c:83
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Neočekávaný token v odpovědi od IMAP serveru %s: "
-
-#: camel/providers/imap4/camel-imap-utils.c:106
-msgid "No data"
-msgstr "Žádná data"
-
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10598,7 +10444,7 @@ msgstr "Nemohu zavřít zdrojovou složku: %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nemohu zavřít dočasnou složku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2458
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nemohu přejmenovat složku: %s"
@@ -11426,44 +11272,44 @@ msgstr "Příkaz QUIT selhal: %s"
 msgid "QUIT command failed"
 msgstr "Příkaz QUIT selhal"
 
-#: 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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "příloha"
 
-#: 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 "Odstranit vybrané položky ze seznamu příloh"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Přidat přílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Přiložit soubor ke zprávě"
 
-#: 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 "Nemohu přiložit soubor %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 "Nemohu přiložit soubor %s: není to normální soubor"
@@ -11485,19 +11331,19 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnout automatické zobrazovaní příloh"
 
-#: 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 "Než budete moci psát zprávu, musíte nastavit účet."
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Cíl odeslání"
 
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Zvolte složky, kam poslat zprávu."
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresář"
 
@@ -11508,45 +11354,45 @@ msgstr "Kliknutím zobrazíte adresář"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:573
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Odpovědět-komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:579
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit příjemce zprávy"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vyplňte adresy, které obdrží kopii této zprávy."
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: 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."
@@ -11557,11 +11403,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Poslat komu:"
 
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Kliknutím sem vyberte složky, kam poslat"
 
@@ -11569,14 +11415,14 @@ msgstr "Kliknutím sem vyberte složky, kam poslat"
 msgid "Attach file(s)"
 msgstr "Připojit soubory"
 
-#: 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 ""
 "Nemohu podepsat odchozí zprávu: Nenastaven podpisový certifikát pro účet "
 "odesílatele"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11584,7 +11430,7 @@ msgstr ""
 "Nemohu zašifrovat odchozí zprávu: Nenastaven šifrovací certifikát pro účet "
 "odesílatele"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11593,30 +11439,30 @@ msgstr ""
 "Chyba při čtení souboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Soubor existuje, přepsat?"
 
-#: composer/e-msg-composer.c:1171 composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba při ukládání souboru: %s"
 
-#: composer/e-msg-composer.c:1211
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba při načítání souboru: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba při přístupu k souboru: %s"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Nemohu získat z editoru"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11625,7 +11471,7 @@ msgstr ""
 "Nemohu hledat v souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11634,7 +11480,7 @@ msgstr ""
 "Nemohu zkrátit soubor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1280
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11643,7 +11489,7 @@ msgstr ""
 "Nemohu kopírovat deskriptor souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1289
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11652,7 +11498,7 @@ msgstr ""
 "Chyba při automatickém ukládaní zprávy: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1393
+#: 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?"
@@ -11660,7 +11506,7 @@ msgstr ""
 "Ximian Evolution našla neuložené zprávy z předchozího sezení.\n"
 "Chcete se pokusit o jejich obnovení?"
 
-#: composer/e-msg-composer.c:1557
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11671,27 +11517,27 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "Nepojmenovaná zpráva"
 
-#: composer/e-msg-composer.c:1566
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Varování: Změněná zpráva"
 
-#: composer/e-msg-composer.c:1599
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Otevřít soubor"
 
-#: composer/e-msg-composer.c:2044
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: composer/e-msg-composer.c:2084 mail/mail-account-gui.c:1317
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "automatický"
 
-#: composer/e-msg-composer.c:2262
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Podpis:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -11699,20 +11545,20 @@ msgstr[0] "<b>%d</b> přiložený soubor"
 msgstr[1] "<b>%d</b> přiložené soubory"
 msgstr[2] "<b>%d</b> přiložených souborů"
 
-#: composer/e-msg-composer.c:2291
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Skrýt lištu _příloh (sem pouštějte přílohy)"
 
-#: composer/e-msg-composer.c:2294 composer/e-msg-composer.c:3170
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Zobrazit lištu _příloh (sem pouštějte přílohy)"
 
-#: composer/e-msg-composer.c:2311 composer/e-msg-composer.c:3052
-#: composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Napsat zprávu"
 
-#: composer/e-msg-composer.c:3082
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11720,7 +11566,7 @@ msgstr ""
 "Nemohu vytvořit okno pro psaní zpráv:\n"
 "Nemohu aktivovat ovládací prvek pro výběr adresy."
 
-#: composer/e-msg-composer.c:3111
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11732,7 +11578,7 @@ msgstr ""
 "Ujistěte se prosím, že máte nainstalovánu\n"
 "správnou verzi gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3215
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11740,7 +11586,7 @@ msgstr ""
 "nemohu vytvořit okno pro psaní zpráv:\n"
 "Nemohu aktivovat komponentu editoru HTML."
 
-#: composer/e-msg-composer.c:4238
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11896,16 +11742,12 @@ msgstr "Synchronizované kategorie:"
 
 #. 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"
@@ -11957,31 +11799,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%H:%M, %x"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12069,6 +11903,11 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Vybrat čas pro porovnání"
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Pravidla _filtru</b>"
+
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Musíte uvést název souboru:"
@@ -12106,18 +11945,18 @@ 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:90
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Důležité"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
+#: 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 "Udělat"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Později"
@@ -12167,42 +12006,22 @@ msgid "    "
 msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "<b>Filter Rules</b>"
-msgstr "<b>Pravidla filtru</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>Virtual _Folders</b>"
-msgstr "<b>Virtuální _složky</b>"
-
-#: filter/filter.glade.h:4
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Pravidla _filtru</b>"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>Zdroje v-složky</b>"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Porovnat"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Editovat filtry"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Editovat V-složky"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Příchozí"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Odchozí"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12210,7 +12029,7 @@ msgstr ""
 "Datum zprávy bude porovnáváno \n"
 "s určeným datem, 12:00 hod. ráno."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12218,7 +12037,7 @@ msgstr ""
 "Datum zprávy bude porovnáváno s časem vztahujícím se \n"
 "k okamžiku, kdy bude prováděno filtrování."
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12226,51 +12045,51 @@ msgstr ""
 "Datum zprávy bude porovnáváno s časem \n"
 "v okamžiku, kdy bude prováděno filtrování."
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "s časem vztahujícím se k současnému času"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "nazpět"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "měsíců"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekundách"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "pouze zvláštní složky"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "se současným časem"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "s časem, který určíte"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "týdnů"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "se všemi aktivními vzdálenými složkami"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "se všemi místními a aktivními vzdálenými složkami"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "se všemi místními složkami"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "let"
 
@@ -12509,7 +12328,7 @@ msgstr "začíná na"
 msgid "Stop Processing"
 msgstr "Zastavit zpracování"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: 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
@@ -12521,7 +12340,7 @@ msgid "Unset Status"
 msgstr "Odnastavit stav"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Název pravidla '%s' není unikátní, vyberte jiný."
@@ -12538,8 +12357,9 @@ msgstr "Upravit pravidlo"
 msgid "Rule name"
 msgstr "Název pravidla"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Pravidla skóre"
 
 #: filter/searchtypes.xml.h:1
@@ -12574,6 +12394,11 @@ msgstr "Předmět obsahuje"
 msgid "Subject does not contain"
 msgstr "Předmět neobsahuje"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Virtuální _složky</b>"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Musíte pojmenovat tuto v-složku."
@@ -12631,8 +12456,8 @@ msgstr "Prohlížeč složek pošty Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Ovládací prvek nastavení pošty Evolution."
 
-#: 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 "Pošta"
@@ -12645,49 +12470,46 @@ msgstr "Účty e-mailu"
 msgid "Mail Preferences"
 msgstr "Nastavení pošty"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Opravdu chcete odstranit tento účet?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Neodstraňovat"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:445
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Implicitní]"
 
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Název účtu"
 
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
-#: 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 "Beze jména"
 
-#: mail/em-composer-prefs.c:336
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Musíte zadat platný název skriptu."
 
-#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
-msgid "[script]"
-msgstr "[skript]"
-
-#: mail/em-composer-prefs.c:878
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Jazyky"
 
-#: mail/em-composer-prefs.c:926
-msgid "Add script signature"
-msgstr "Přidat skript podpisu"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "Přid_at podpis"
 
-#: mail/em-composer-prefs.c:946
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Podpisy"
 
@@ -12744,7 +12566,7 @@ msgstr ""
 "Nemohu otevřít složku konceptů pro tento účet.\n"
 "Chcete použít implicitní složku konceptů?"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvořit virtuální _složku z vyhledávání..."
 
@@ -12778,7 +12600,7 @@ msgstr "<kliknutím zde vyberete složku>"
 msgid "Create New Folder"
 msgstr "Vytvořit novou složku"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2218
+#: 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:"
@@ -12790,7 +12612,7 @@ msgid "Folder _name:"
 msgstr "_Název složky:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "V-složky"
 
@@ -12807,118 +12629,118 @@ msgstr "Příchozí"
 msgid "Loading..."
 msgstr "Načítám..."
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "Přesouvám složku %s"
 
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopíruji složku %s"
 
-#: mail/em-folder-tree.c:883
+#: mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Přesouvám zprávy do složky %s"
 
-#: mail/em-folder-tree.c:885
+#: mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopíruji zprávy do složky %s"
 
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nelze upustit zprávy do úložiště nejvyšší úrovně"
 
-#: mail/em-folder-tree.c:1947
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Nemohu přejmenovat složku `%s': Neplatná operace"
 
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: 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 "Vyberte složku"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2035
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Vytvářím složku `%s'"
 
-#: mail/em-folder-tree.c:2218 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Vytvořit složku"
 
-#: mail/em-folder-tree.c:2335
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nemohu odstranit složku: %s"
 
-#: mail/em-folder-tree.c:2360
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Nemohu odstranit místní složku %s."
 
-#: mail/em-folder-tree.c:2366
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Opravdu odstranit složku \"%s\" a všechny její podsložky?"
 
-#: mail/em-folder-tree.c:2376
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Odstranit \"%s\""
 
-#: mail/em-folder-tree.c:2410
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Nemohu přejmenovat místní složku %s."
 
-#: mail/em-folder-tree.c:2419
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Přejmenovat složku \"%s\" na:"
 
-#: mail/em-folder-tree.c:2421
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Přejmenovat složku"
 
-#: mail/em-folder-tree.c:2445
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Již existuje složka nazvaná \"%s\". Použijte prosím jiný název."
 
-#: mail/em-folder-tree.c:2491 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 "_Zobrazení"
 
-#: mail/em-folder-tree.c:2492
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Otevřít v _novém okně"
 
-#: mail/em-folder-tree.c:2497
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Přesunout"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Nová složka..."
 
-#: mail/em-folder-tree.c:2504
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: mail/em-folder-tree.c:2507 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Vla_stnosti..."
 
@@ -13068,53 +12890,53 @@ msgstr "Tisknout zprávu"
 msgid "_Copy Link Location"
 msgstr "_Kopírovat umístění odkazu"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím sem pošlete e-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 "Nalezeno: %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 "Nepodepsána"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Zpráva není podpesána. Není zaručeno, že je tato zpráva pravá."
 
-#: 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 "Platný podpis"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 "Tato zpráva je podepsána a je platná, takže je velmi pravděpodobně pravá."
 
-#: 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 "Neplatný podpis"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Podpis této zprávy nemůže být ověřen, možná byla při přenosu změněna."
 
-#: 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 "Platný podpis, nemohu ověřit odesílatele"
 
-#: 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."
@@ -13122,11 +12944,11 @@ msgstr ""
 "Tato zpráva je podepsána platným podpisem, ale odesílatel zprávy nemůže být "
 "ověřen."
 
-#: 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 "Nešifrována"
 
-#: 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."
@@ -13134,11 +12956,11 @@ msgstr ""
 "Tato zpráva není šifrována. Její obsah může být čten při přenosu přes "
 "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 "Šifrována slabě"
 
-#: 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 "
@@ -13148,11 +12970,11 @@ msgstr ""
 "zvenku by bylo těžké, ale ne nemožné zobrazit obsah této zprávy v rozumném "
 "čase."
 
-#: 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 "Šifrována"
 
-#: 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."
@@ -13160,11 +12982,11 @@ msgstr ""
 "Tato zpráva je šifrována. Pro člověka zvenku by bylo těžké zobrazit obsah "
 "této zprávy."
 
-#: 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 "Šifrována, silně"
 
-#: 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 "
@@ -13173,31 +12995,31 @@ msgstr ""
 "Tato zpráva je šifrována. Pro člověka zvenku by bylo velmi těžké zobrazit "
 "obsah této zprávy v rozumném čase."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Zobrazit certifikát"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Tento certifikát nelze zobrazit"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Dokončeno dne %d. %B %Y, %H:%M"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Již mělo být splněno:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Zobrazit v textu"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Skrýt"
 
@@ -13206,92 +13028,92 @@ msgstr "_Skrýt"
 msgid "Page %d of %d"
 msgstr "Stránka %d z %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 "Získávám `%s'"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Chybná část externího těla."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%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 "Odkaz na místní soubor (%s) platný na serveru \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na místní soubor (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdálená 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 "Odkaz na neznámá externí data (typ \"%s\")"
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Formátuji zprávu"
 
-#: mail/em-format-html.c:1406 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:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1406 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:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Odpovědět-komu"
 
-#: mail/em-format-html.c:1406 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:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/em-format-html.c:1406 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Kopie"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
+#: 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 "Skrytá kopie"
 
 #. pseudo-header
-#: mail/em-format-html.c:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Program elektronické pošty"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: 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:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
+#: 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 "Datum"
 
-#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
@@ -13367,22 +13189,22 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: 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 "Nemohu převést cache uid pop3: %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 "Nemohu převést stav rozbalení složky: %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 "Nemohu vytvořit adresář `%s': %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nemohu otevřít úložiště pro `%s': %s"
@@ -13421,32 +13243,32 @@ msgstr "_Přidat do adresáře"
 msgid "Open in %s..."
 msgstr "Otevřít v %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 "Toto úložiště nepodporuje přihlášení nebo přihlášení nejsou povolena."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Přihlášeno"
 
-#: 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 "Složka"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:831
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Vyberte prosím server."
 
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Nebyl vybrán žádný server"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Příště tuto zprávu nezobrazovat."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13455,25 +13277,25 @@ msgstr ""
 "Chyba při načítání informací o filtrech:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Přeposlaná zpráva --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "neznámý odesílatel"
 
 #. 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 "V %a %d. %m. %Y v %H:%M %%+05d píše %%s:"
 
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13482,7 +13304,7 @@ msgstr ""
 "Nemohu uložit do `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13491,35 +13313,35 @@ msgstr ""
 "`%s' již existuje.\n"
 "Chcete jej přepsat?"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "zpráva"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Chyba: '%s' existuje a není normální soubor"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Uložit zprávu..."
 
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Přidat adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr "Zprávy z %s"
 
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nemohu vytvořit dočasný adresář: %s"
 
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13532,7 +13354,7 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto zprávy?"
 
-#: mail/em-utils.c:2477
+#: 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"
@@ -13601,46 +13423,56 @@ msgid "Default height of the Message Window"
 msgstr "Implicitní výška okna zprávy"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Implicitní výška okna zprávy"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Implicitní styl odpovědí"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Implicitní šířka okna pro psaní zpráv"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Implicitní šířka okna zprávy"
 
-#: 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 "Implicitní šířka okna zprávy"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Kreslit indikaci překlepů ve slovech, když píšete."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Vyprazdňovat složky Koš při ukončení"
 
-#: 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 "Vyprazdňovat všechny složky Koš při ukončování 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 "Povolit režim kurzoru, takže při čtení pošty vidíte kurzor."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Povolit/zakázat režim kurzoru"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Výška panelu seznamu zpráv"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Výška panelu seznamu zpráv."
 
-#: 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 "
@@ -13650,19 +13482,19 @@ msgstr ""
 "pro zobrazení obsahu použity všechny typy mime, které jsou v tomto seznamu a "
 "v databázi typů mime GNOME jim odpovídá komponenta bonobo prohlížeče."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid "Last time empty trash was run"
 msgstr "Datum, kdy bylo naposledu spuštěno vyprázdnění koše"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "Seznam štítků a jim přiřazených barev"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Seznam účtů"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: 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."
@@ -13670,11 +13502,11 @@ msgstr ""
 "Seznam účtů, které zná komponenta pošty Evolution. Seznam obsahuje řetězce "
 "určující podadresáře relativně k /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "Seznam vlastních hlaviček a toho, jestli jsou povoleny."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: 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."
@@ -13682,15 +13514,15 @@ msgstr ""
 "Seznam štítků, které zná komponenta pošty Evolution. Seznam obsahuje řetězce "
 "tvaru název:barva, kde barva používá kódování HTML hex."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Seznam typů mime, pro které hledat komponenty bonobo prohlížečů"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr "Načítat obrázky pro zprávy v HTML přes http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: 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 - "
@@ -13700,89 +13532,89 @@ msgstr ""
 "Nikdy nenačítat obrázky ze sítě 1 - načítat obrázky ze sítě, pokud je "
 "odesílatel v adresáři 2 - vždy načítat obrázky ze sítě"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Zaznamenávat akce filtrů"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "Zaznamenávat akce filtrů do určeného souboru záznamů."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Soubor, kam zaznamenávat akce filtrů"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Soubor, kam zaznamenávat akce filtrů."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Označit jako přečtené po určeném čase"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Označit jako přečtené po určeném čase."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označit citace v \"náhledu\" zprávy"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označit citace v \"náhledu\" zprávy."
 
 # FIXME: s/hight/height/
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Implicitní výška okna zprávy"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Implicitní šířka okna zprávy"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Styl zobrazování zprávy (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum dní mezi vyprázdňováním koše při ukončení"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum dní mezi vyprázdňováním koše při ukončení ve dnech."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "Soubor zvuku upozornění na novou poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Typ upozornění na novou poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Upozorňovat při prázdném předmětu"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upozorňovat uživatele, když se pokusí vyčistit složku"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: 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 "Upozorňovat uživatele, když se pokusí odeslat zprávu bez předmětu."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Upozorňovat, když uživatel čistí"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Upozorňovat, když uživatel vyplní jen Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: 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."
@@ -13790,98 +13622,109 @@ msgstr ""
 "Upozorňovat, když se uživatel pokusí poslat zprávu v HTML příjemcům, kteří "
 "možná nechtějí přijímat poštu v HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Upozorňovat, když se uživatel pokusí odeslat zprávu bez příjemců Komu a "
 "Kopie."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upozorňovat, když se uživatel pokusí odeslat nechtěné HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr "Rozpoznávat v textu odkazy a nahrazovat je."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Rozpoznávat v textu úsměvy a nahrazovat je obrázky."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Spouštět na příchozí poště testy na smetí"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "T4jny prep1n4c"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "T4jny prep1n4c."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Odesílat poštu implicitně v HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Odesílat poštu implicitně v HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Zobrazovat animace"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Zobrazovat animované obrázky jako animace."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Zobrazovat odstraněné zprávy v seznamu zpráv (přeškrtnutě)."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "Zobrazovat odstraněné zprávy v seznamu zpráv"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Zobrazovat panel \"Náhled\""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Zobrazovat panel \"Náhled\"."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Souboru zvuku, který přehrát, když přijde nová pošta."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Určuje typ upozornění na novou poštu, které chce uživatel používat."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Hledat překlepy průběžně"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+# FIXME: s/hight/height/
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Implicitní výška okna zprávy"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Implicitní šířka okna zprávy"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Písmo terminálu"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "Datum, kdy bylo naposledy spuštěno vyprázdňování koše ve dnech od epoch."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "Písmo terminálu pro zobrazování pošty"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "Písmo s proměnnou šířkou pro zobrazování pošty"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: 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;"
@@ -13893,99 +13736,99 @@ msgstr ""
 "enabled&gt; - nastavte enabled, pokud se má hlavička zobrazovat v pohledu na "
 "poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Seskupovat vlákna v seznamu zpráv."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Seskupovat vlákna v seznamu zpráv"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "Seskupovat vlákna v seznamu zpráv podle předmětu"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Čas pro označení zprávy jako přečtené"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Čas pro označení zprávy jako přečtené."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Řetězec UID implicitního účtu."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Používat démona a klienta Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Používat démona a klienta Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Používat vlastní písma"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Používat pro zobrazování pošty vlastní písma"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Používat jen místní testy spamu."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Používat jen místní testy spamu (bez DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Písmo s proměnlivou šířkou:"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "Položka menu Zobrazit/Skrytá kopie je zaškrtnuta"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "Položka menu Zobrazit/Skrytá kopie je zaškrtnuta."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "Položka menu Zobrazit/Kopie je zaškrtnuta."
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "Položka menu Zobrazit/Kopie je zaškrtnuta"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "Položka menu Zobrazit/Od je zaškrtnuta"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "Položka menu Zobrazit/Od je zaškrtnuta."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "Položka menu Zobrazit/Poslat komu je zaškrtnuta"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "Položka menu Zobrazit/Poslat komu je zaškrtnuta."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "Položka menu Zobrazit/Odpovědět komu je zaškrtnuta"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "Položka menu Zobrazit/Odpovědět komu je zaškrtnuta."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: 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."
@@ -13993,11 +13836,11 @@ msgstr ""
 "Jestli seskupovat zprávy podle předmětů, když zprávy neobsahují hlavičky In-"
 "Reply-To ani References."
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "port pro spouštění uživatelem spouštěného spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "port spamd"
 
@@ -14036,14 +13879,14 @@ msgstr "Evolution importuje vaši starou poštu Elm"
 #: 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 "Importuji..."
 
 #: 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 "Čekejte, prosím"
 
@@ -14088,12 +13931,12 @@ msgstr "Importuji mailbox"
 msgid "Scanning %s"
 msgstr "Prohledávám %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritní filtr \"%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"
@@ -14118,7 +13961,7 @@ msgstr ""
 "Zkontrolujte importované filtry a ujistěte se, že vše funguje tak,\n"
 "jak má."
 
-#: 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"
@@ -14130,7 +13973,7 @@ msgstr ""
 "které nejsou v Evolution podporovány.\n"
 "Tyto filtry byly vynechány."
 
-#: 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"
@@ -14144,23 +13987,23 @@ msgstr ""
 "tak, aby testovaly, zdali se řetězec vyskytuje\n"
 "uvnitř těla zprávy."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše stará data z Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Importuji data Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Nastavení"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Filtry pošty"
 
-#: 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?"
@@ -14192,12 +14035,12 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili jste všechny požadované informace."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:145
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr "Editor účtů Evolution"
 
@@ -14213,7 +14056,7 @@ msgstr "_Jméno uživatele:"
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:2086
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Nemůžete vytvořit dva účty se stejným jménem."
 
@@ -14246,11 +14089,11 @@ msgstr "Odpovědi pro %s"
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Následující pravidla filtru:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14293,11 +14136,11 @@ msgstr "Vytvořit novou složku pošty"
 msgid "URI of the mail source that the view will display"
 msgstr "URI zdroje pošty, který bude pohled zobrazovat"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identita"
 
-#: 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 "
@@ -14307,12 +14150,12 @@ msgstr ""
 "být vyplněna, ledaže byste si přáli, aby byly tyto informace obsaženy v "
 "odesílaných e-mailech."
 
-#: 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 "Příjem pošty"
 
-#: 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."
@@ -14320,15 +14163,15 @@ msgstr ""
 "Zadejte prosím informace o svém serveru pro příchozí poštu. Pokud si nejste "
 "jisti, kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Vyberte si prosím z následujících možností"
 
-#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Odesílání pošty"
 
-#: 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."
@@ -14336,11 +14179,11 @@ msgstr ""
 "Zadejte prosím informace o způsobu odesílání pošty. Pokud si nejste jisti, "
 "kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: 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 "
@@ -14353,11 +14196,11 @@ msgstr ""
 "pro vytvoření poštovního účtu Evolution. Zadejte prosím níže název pro tento "
 "účet. Tento název bude použit pouze pro zobrazení."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Kontroluji službu"
 
-#: 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 "Připojuji se k serveru..."
 
@@ -14979,7 +14822,7 @@ msgstr "popis"
 msgid "Pinging %s"
 msgstr "Kontaktuji %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14988,7 +14831,7 @@ msgstr ""
 "Chyba během '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14997,7 +14840,7 @@ msgstr ""
 "Chyba při vykonávání operace:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Pracuji"
 
@@ -15203,68 +15046,68 @@ msgstr "<span weight=\"bold\">Šifrování</span>"
 msgid "Security Information"
 msgstr "Informace o zabezpečení"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Ruší se..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Odeslat a přijmout poštu"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Zrušit _vše"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: 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 "Čeká se..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Uživatel zrušil operaci."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadat heslo pro %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Zadat heslo"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Zapamatovat si toto heslo"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamatovat si toto heslo pro zbytek tohoto sezení"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nemohu uložit soubor podpisu: %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"
@@ -15274,23 +15117,23 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Zahodit změny"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Uložit podpis"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Upravit podpis"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Zadejte název tohoto podpisu."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Název:"
 
@@ -15318,17 +15161,17 @@ msgstr "Přeposlaná zpráva"
 msgid "Invalid folder: `%s'"
 msgstr "Neplatná složka: `%s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavuji v-složku: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizuji v-složky pro uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15341,84 +15184,84 @@ msgstr ""
 "    '%s'\n"
 "A byly aktualizovány."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "v-složky"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Upravit V-složku"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokus o úpravu v-složky '%s', která neexistuje."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Nová V-složka"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Přečtené"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Nižší"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Vyšší"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: 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 "Dnes %k:%M"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: 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 "Generuji seznam zpráv"
 
@@ -15712,7 +15555,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Zvolte cíl pro tento 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 "Vyberte prosím informace, které chcete importovat:"
 
@@ -15741,26 +15584,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vyberte importér"
 
-#: 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 "Soubor %s neexistuje"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importuji"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importuji %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 "Chyba při načítání %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15769,31 +15612,31 @@ msgstr ""
 "Importuji %s\n"
 "Importuji položku 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Název souboru:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Typ souboru:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Importovat data a nastavení ze _starších programů"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Importovat _jeden soubor"
 
-#: 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"
@@ -15801,25 +15644,25 @@ msgstr ""
 "Čekejte prosím...\n"
 "Hledám existující nastavení"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Spouštím inteligentní importy"
 
-#: 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 "Z %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Pro soubor %s není k dispozici importér"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "Nemohu spustit importér"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importovat"
 
@@ -15861,11 +15704,11 @@ msgstr "Nemohu otevřít sdílenou složku: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nemohu nalézt zadanou sdílenou složku."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Spouštím 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 "
@@ -15983,7 +15826,6 @@ msgstr "Zaškrtávací pole"
 
 #: 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 "Nový"
 
@@ -16037,16 +15879,17 @@ msgid "Create a new test item"
 msgstr "Vytvořit novou položku testu"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Aktivní spojení"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Pro zavření těchto spojení a práci při odpojení klikněte na OK."
+msgid "Active Connections"
+msgstr "Aktivní spojení"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Následující spojení jsou právě aktivní:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Pro zavření těchto spojení a práci při odpojení klikněte na OK."
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16164,28 +16007,28 @@ msgstr ""
 "Tento asistent vás provede importem\n"
 "externího souboru do Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importéry"
 
-#: 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 "Importovat"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Neimportovat"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Příště se neptat"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našel tyto soubory dat vhodné pro import:"
 
 #. 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"
@@ -16220,7 +16063,7 @@ msgstr ""
 "Doufáme, že si užijete výsledků naší tvrdé práce a nedočkavě čekáme\n"
 "na vaše přispění!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16228,48 +16071,48 @@ msgstr ""
 "Děkujeme\n"
 "Tým Ximian Evolution\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Příště neupozorňovat"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "nemohu inicializovat shell Ximian Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nemohu inicializovat shell Ximian Evolution: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Spustit Evolution a aktivovat určenou komponentu"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Spustit v režimu odpojení"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Spustit v režimu on-line"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Vynuceně ukončit všechny komponenty evolution"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Vynuceně znovu převést z Evolution 1.4"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslat ladící výstup ze všech komponent do souboru."
 
-#: 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"
@@ -16786,7 +16629,7 @@ msgstr "Přesunout kontakty do jiné složky..."
 msgid "Move to Folder..."
 msgstr "Přesunout do složky..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Vložit schránku"
 
@@ -16794,9 +16637,9 @@ msgstr "Vložit schránku"
 msgid "Previews the contacts to be printed"
 msgstr "Náhled kontaktů před tiskem"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: 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 "_Náhled před tiskem"
 
@@ -16844,13 +16687,13 @@ msgstr "Zastavit načítání"
 msgid "View the current contact"
 msgstr "Zobrazit aktuální kontakt"
 
-#: 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 "_Akce"
 
@@ -16871,14 +16714,10 @@ msgid "_Save as VCard"
 msgstr "_Uložit jako VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Hledat kontakty"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Vybrat _vše"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Poslat kontaktu _zprávu..."
 
@@ -16886,103 +16725,116 @@ msgstr "Poslat kontaktu _zprávu..."
 msgid "Day"
 msgstr "den"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Odstranit všechny výskyty"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Zrušit událost"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Odstranit tento výskyt"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Odstranit tento výskyt"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Jít na"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Jít zpět"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Jít dopředu"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Seznam"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "měsíc"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Další"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Náhledy kalendáře k tisku"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Předchozí"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Tisknout tento kalendář"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Zveřejnit informace o volném/obsazeném čase pro tento kalendář"
 
-#: ui/evolution-calendar.xml.h:19 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Vy_čistit"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Vyčistit staré události a schůzky"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Zvolit _datum"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Zvolit na určité datum"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Zvolit dnešek"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Zobrazit jako seznam"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Zobrazovat jeden den"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Zobrazovat jeden měsíc"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Zobrazovat jeden týden"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Zobrazovat pracovní týden"
 
-#: 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 "Dnes"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Zobrazit aktuální událost"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "týden"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otevřít událost"
 
@@ -17519,10 +17371,6 @@ msgstr "Přesunout"
 msgid "Move selected message(s) to another folder"
 msgstr "Přesunout vybrané zprávy do jiné složky"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Další"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "následující důležit_ou zprávu"
@@ -17571,10 +17419,6 @@ msgstr "př_edchozí důležitou zprávu"
 msgid "Preview the message to be printed"
 msgstr "Náhled zprávy před tiskem"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Předchozí"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Vytisknout tuto zprávu"
@@ -17985,39 +17829,39 @@ msgstr "Kopírovat vybraný úkol"
 msgid "Cut selected task"
 msgstr "Vyjmout vybraný úkol"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Odstranit dokončené úkoly"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Odstranit vybrané úkoly"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Označit jako _dokončený"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Označit vybrané úkoly jako dokončené"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Vložit úkol ze schránky"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Náhled seznamu úkolů před tiskem"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Tisknout seznam úkolů"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Zobrazit vybraný úkol"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Otevřít úkol"
 
@@ -18147,10 +17991,15 @@ msgid "_Day View"
 msgstr "Zobrazení _dne"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Upravené zobrazení"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Zobrazení _měsíce"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Zobrazení _pracovního týdne"
 
@@ -18179,10 +18028,16 @@ msgid "_Messages"
 msgstr "_Zprávy"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "_S kategorií"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Termín dokončení:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Nastavit stav"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Úkoly"
 
@@ -18245,10 +18100,6 @@ msgstr "%B %Y"
 msgid "Now"
 msgstr "Nyní"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Dnes"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18258,82 +18109,87 @@ msgstr "Čas musí být ve formátu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentuální hodnota musí být mezi 0 a 100 včetně."
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltské"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Střední Evropa"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Čínské"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cyrilice"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Řecké"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japonské"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Korejské"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turecké"
 
-#: 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 "Západní Evropa"
 
-#: 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 "Západní Evropa"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "tradiční"
 
-#: 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 "zjednodušené"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrajinské"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "vizuální"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznámá znaková sada: %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 "Kódování znaků"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Zvol jakou znakovou sadu použít"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Jiné..."
 
@@ -18397,6 +18253,11 @@ msgstr "Mezera okolo indikátoru"
 msgid "Spacing around expander arrow"
 msgstr "Mezera okolo šipky rozbalovače"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Hledat"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Editor vyhledávání"
@@ -18460,6 +18321,109 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovo)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Zdroje adresáře"
+
+#~ msgid "Selected:"
+#~ msgstr "Vybráno:"
+
+#~ msgid "Unexpected response from IMAP server %s: %s"
+#~ msgstr "Neočekávaná odpověď od IMAP serveru %s: %s"
+
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "Nemohu odstranit složku '%s': Neplatný název schránky"
+
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "Nemohu zvolit složku `%s': Špatný příkaz"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP server %s se neočekávaně odpojil: %s"
+
+#~ msgid "Got BYE response"
+#~ msgstr "Dostal jsem odpověď BYE"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Nemohu se připojit k serveru IMAP %s v zabezpečeném režimu: Server "
+#~ "nepodporuje STARTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "Nemohu se autentizovat u IMAP serveru %s pomocí mechanismu autentizace %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%sZadejte prosím heslo IMAP pro %s na počítači %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Nemohu se autentizovat u IMAP serveru %s pomocí %s"
+
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr "Nemohu přejmenovat složku `%s': Neplatný název schránky"
+
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "Nemohu vytvořit složku `%s': Špatný příkaz"
+
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "Nemohu odstranit složku `%s': Speciální složka"
+
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "Nemohu odstranit složku `%s': Neplatný název schránky"
+
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "Nemohu odstranit složku `%s': Špatný příkaz"
+
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "Nemohu se přihlásit ke složce `%s': Neplatný název schránky"
+
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "Nemohu se přihlásit ke složce `%s': Špatný příkaz"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr "Nemohu se odhlásit od složky `%s': Neplatný název schránky"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "Nemohu se odhlásit od složky `%s': Špatný příkaz"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Neočekávaný token v odpovědi od IMAP serveru %s: "
+
+#~ msgid "No data"
+#~ msgstr "Žádná data"
+
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "<b>Pravidla filtru</b>"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Editovat filtry"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Editovat V-složky"
+
+#~ msgid "Outgoing"
+#~ msgstr "Odchozí"
+
+#~ msgid "[script]"
+#~ msgstr "[skript]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Přidat skript podpisu"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Následující spojení jsou právě aktivní:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Hledat kontakty"
+
+#~ msgid "With _Category"
+#~ msgstr "_S kategorií"
+
 #~ msgid "Description"
 #~ msgstr "Popis"
 
diff --git a/po/da.po b/po/da.po
index 74c1d9ada6..91db728bb0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -20,6 +20,48 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\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 adressebog"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "med alle lokale og aktive eksterne mapper"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Gem som"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Opgaver "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kort"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 kort"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakter: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _vindue"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadresse:"
@@ -102,78 +144,94 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adressebog"
 
-#: 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 "Slet"
 
-#: 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 "Egenskaber ..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "Ny kontakt:"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Opret en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Opret en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Adressebog"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Adressebog"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Opret en ny opgave"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Tilslutning til LDAP-serveren mislykkedes"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Mislykkedes med godkendelse på 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 "Kunne ikke gennemføre forespørgsel på rod-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 "Serveren svarede at ingen søgebaser understøttes"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Fejl ved hentning af schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Serveren svarede ikke med gyldig schemainformation"
 
@@ -199,17 +257,17 @@ msgstr "Pinger %s"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personligt"
 
@@ -266,7 +324,7 @@ msgstr "Bagenden for denne adressbog nægtede at gennemføre denne forespørgsel
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel udførtes ikke successfuldt."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -275,7 +333,7 @@ msgstr ""
 "Kunne ikke åbne denne adressebog. Kontrollér venligst at stien\n"
 "eksisterer, og at du har rettigheder til at tilgå den."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -285,7 +343,7 @@ msgstr ""
 "at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
 "kan nåes."
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -297,7 +355,7 @@ msgstr ""
 "må du oversætte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra adressen nedenfor.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -307,29 +365,29 @@ msgstr ""
 "at du har angivet en fejlagtig URI eller at LDAP-serveren ikke\n"
 "kunne nåes."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åbne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Tilslutter LDAP-serveren anonymt"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Mislykkedes med godkendelse.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAngiv adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "URIen som kalenderen skal vise"
@@ -353,16 +411,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  _Vis de baser som understøttes "
 
-#: 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
@@ -377,62 +429,53 @@ msgstr "  _Vis de baser som understøttes "
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "LDAP-konfigurationsassistent"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adressebogs-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Adressbogskilder..."
-
-#: 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 "Altid"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -445,52 +488,52 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme de indstillinger du har angivet her."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: 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
 #, fuzzy
 msgid "Email address:"
 msgstr "E-post-_adresse:"
 
-#: 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 vil anvende dette DN for at godkende dig på servern"
 
-#: 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 vil bruge denne adresse til at godkende dig på serveren"
 
-#: 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 "Færdig"
 
-#: 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 "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Gruppe"
 
-#: 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 "Aldrig"
 
-#: 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"
@@ -504,23 +547,19 @@ msgstr ""
 "serverer for kryptografisk at beskytte din tilslutning. Spørg din "
 "systemadministratør om din LDAP-server anvender disse protokoller."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Én"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Søger..."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Valgt:"
-
-#: 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"
@@ -529,7 +568,7 @@ msgstr ""
 "At vælge dette alternativ indebærer at Evolution kun vil tilslutte til din\n"
 "LDAP-server hvis den understøtter SSL eller 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"
@@ -546,7 +585,7 @@ msgstr ""
 "på arbejdet behøver Evolution ikke at anvende SSL/TLS eftersom forbindelsen "
 "allerede er sikker."
 
-#: 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"
@@ -559,7 +598,7 @@ msgstr ""
 "Dette betyder at din forbindelse vil være usikker, og at du bliver \n"
 "sårbar overfor angreb."
 
-#: 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 "
@@ -569,7 +608,7 @@ msgstr ""
 "At vælge dette alternativ vil lade dig ændre Evolutions indstillinger\n"
 "for LDAP-søgninger, og for at oprette og redigere kontakter."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -579,35 +618,35 @@ msgstr ""
 "At vælge et visningsnavn er det sidste nødvendige skridt ved konfiguration "
 "af en LDAP-server."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Skridt 1: Serverinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Skridt 2: Tilslutter server"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Skridt 3: Søger i kataloget"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: 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"
@@ -621,7 +660,7 @@ msgstr ""
 "skal ændre\n"
 "disse."
 
-#: 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"
@@ -633,7 +672,7 @@ msgstr ""
 "Hvis du efterlader dette tomt kommer søgningen at begynde ved roden af "
 "katalogtræet."
 
-#: 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"
@@ -648,7 +687,7 @@ msgstr ""
 "Søgeomfanget \"one\" inkluderer alene de poster som er et niveau under din "
 "søgebase.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -666,7 +705,7 @@ msgstr ""
 "finde\n"
 "denne 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"
 "\"."
@@ -674,7 +713,7 @@ msgstr ""
 "Dette er det komplette navn på din ldap-server. For eksempel \"ldap.mitfirma."
 "dk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -685,7 +724,7 @@ msgstr ""
 "højt\n"
 "sænkes hastigheden på adressebogen."
 
-#: 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 "
@@ -695,7 +734,7 @@ msgstr ""
 "at sætte dette til \"E-postadresse\" kræver anonym adgang til din 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"
@@ -704,7 +743,7 @@ msgstr ""
 "Dette er navnet på denne server, som vises i din Evolution-mappliste.\n"
 "Det anvends kun i forbindelse med visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -714,7 +753,7 @@ msgstr ""
 "Dette er navnet på denne server, som vises i din Evolution-mappliste.\n"
 "Det anvends kun i forbindelse med visning."
 
-#: 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"
@@ -725,28 +764,28 @@ msgstr ""
 "En liste med standard er givet. Spørg din systemadministrator hvilken port "
 "du skal bruge."
 
-#: 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 "Denne indstilling styrer hvor lang tid en søgning må køre."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "An_vend SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Bruger distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Bruger e-postadresse"
 
-#: 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 "Når det er muligt"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -759,60 +798,48 @@ msgstr ""
 "brugerinformation. Spørg din systemadministratør hvis du er usikker på denne "
 "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 "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: 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 "R_edigér"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Logindmetode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "forbindelsesfaneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "generel-faneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
@@ -844,7 +871,7 @@ msgid "Send HTML Mail?"
 msgstr "Send HTML-baseret e-post?"
 
 #: 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 "Tilføj i kontakter"
 
@@ -860,7 +887,7 @@ msgstr "Navn"
 
 #: 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 "Kilde"
 
@@ -938,7 +965,8 @@ msgstr "Samarbejde"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -947,7 +975,7 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: 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 "Detaljer"
@@ -1039,16 +1067,27 @@ msgstr "Ka_tegorier..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Slet"
 
+#: 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 "R_edigér"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
@@ -1094,22 +1133,22 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2101,9 +2140,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 #, fuzzy
 msgid "Jabber"
 msgstr "Navnløs liste"
@@ -2118,21 +2157,22 @@ msgid "MSN Messenger"
 msgstr "Send _besked"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Tjeneste klar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Sted:"
@@ -2143,115 +2183,99 @@ msgid "Username"
 msgstr "Bruger_navn:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Hjemme"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Arbejde"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Kilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Ændret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Kategori-redigering ikke tilgængelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt hører til disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Gem kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"fjerne disse kontakter?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakt?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Gruppe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finde widget for felt: `%s'"
@@ -2266,6 +2290,7 @@ msgid "_Edit Full"
 msgstr "Redigér alt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Fulde navn:"
@@ -2275,6 +2300,22 @@ msgstr "_Fulde navn:"
 msgid "E-_mail:"
 msgstr "E-post"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"fjerne disse kontakter?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette denne kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2380,24 +2421,28 @@ msgstr "_Titel:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Kontonavn"
+msgid "Add IM Account"
+msgstr "E-post-konti"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "E-post-konti"
+msgid "_Account name:"
+msgstr "Kontonavn"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Tjeneste klar"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Sted:"
 
+#: 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 "Medlemmer"
@@ -2420,25 +2465,26 @@ msgstr "Skriv en e-post-adresse eller træk en kontakt ind i feltet nedenfor:"
 msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
-#: 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 "Bog"
 
-#: 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 "Er ny liste"
 
 #. 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 "Kontaktlisteredigering"
 
-#: 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 "Gem liste som VCard"
 
@@ -2491,24 +2537,21 @@ msgid "No contacts"
 msgstr "Vis kontakter"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Kontakter"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakter"
+msgstr[1] "Kontakter"
 
-#: 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 "Forespørgsel"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Fejl ved bogvisning"
 
@@ -2520,133 +2563,132 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Navn begynder med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "E-postadresse begynder med"
 
-#: 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 "Kategorien er"
 
 #. 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 "Et felt indeholder"
 
-#: 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 "Avanceret..."
 
-#: 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
 #, fuzzy
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: 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 "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importér..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Søg efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbogskilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilotindstillinger..."
 
-#: 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 "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressebog..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressebog..."
 
-#: 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 "Klip ud"
 
-#. 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 "Kopier"
 
-#: 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 "Indsæt"
 
-#: 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 "Aktuel visning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2658,7 +2700,7 @@ msgstr ""
 "er gået ned. Du skal genstarte Evolution for at kunne anvende den igen"
 
 #. 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 "Enhver kategori"
@@ -2692,8 +2734,6 @@ msgid "Car Phone"
 msgstr "Biltelefon"
 
 #: 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 "Kategorier"
 
@@ -2702,7 +2742,7 @@ msgid "Company Phone"
 msgstr "Firmatelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2756,6 +2796,7 @@ msgid "Manager"
 msgstr "Leder"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -2764,7 +2805,7 @@ msgid "Nickname"
 msgstr "Kaldenavn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2773,7 +2814,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2831,17 +2872,17 @@ msgid "Web Site"
 msgstr "Netside"
 
 #: 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 "Bredde"
 
 #: 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 "Højde"
 
 #: 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 "Har fokus"
 
@@ -2893,92 +2934,95 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Valgt"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Arbejde"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Gruppe"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Personligt"
+msgid "work"
+msgstr "Arbejde"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Personligt"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "_Jobtitel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Fax hjemme"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Succes"
 
-#: 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
@@ -2986,98 +3030,98 @@ msgstr "Succes"
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
-#: 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 "Afbrudt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adressbogen findes ikke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme ændringene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: 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
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: 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
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3086,7 +3130,7 @@ msgstr ""
 "At åbna %d kort vil yderligere åbne %d nye vinduer.\n"
 "Ønsker du virkelig at vise alle disse kort?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3095,54 +3139,54 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fejl ved gemning af %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 "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: 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"
@@ -3179,36 +3223,33 @@ msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
 msgid "Querying Address Book..."
 msgstr "Kører forespørgsel i adressebog..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Redigér kontaktinfo"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Flet e-postadresse"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "og %d andre kort."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "og ét andet kort."
+msgid_plural "and %d other contacts."
+msgstr[0] "og ét andet kort."
+msgstr[1] "og ét andet kort."
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Vis brevets _kildetekst"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Gem kontakt som VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
@@ -3358,7 +3399,7 @@ msgstr "Margener"
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
-#: 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 "Valgmuligheder"
 
@@ -3542,7 +3583,7 @@ msgid "Unnamed List"
 msgstr "Navnløs liste"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Indtast adgangskode"
@@ -3623,7 +3664,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolutions testkomponent"
 
 #: 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"
@@ -3670,24 +3711,24 @@ msgstr "Udsæt-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edigér aftale"
 
-#: 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 "Åbn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3696,12 +3737,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Advarsel"
 
-#: 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"
@@ -3713,7 +3754,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for påmindelse i stedet."
 
-#: 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 "
@@ -3730,7 +3771,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køre dette 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 "Spørg mig ikke om dette program igen."
 
@@ -3904,13 +3945,13 @@ msgstr "Kommentar indeholder"
 msgid "Location contains"
 msgstr "Beskrivelse indeholder"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
-#: 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 "Kalender"
 
@@ -3932,7 +3973,7 @@ msgid "Purge events older than"
 msgstr "returnerer mindre end"
 
 #: 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 "dage"
 
@@ -3943,7 +3984,7 @@ msgstr "%A den %d. %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
@@ -3965,77 +4006,77 @@ 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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Møde"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "Mød_e"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opret en ny mødeindkaldelse"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nyt heldagsmøde"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmøde"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alender:"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Opret en ny mappe"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4065,11 +4106,6 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Tilrettet visning"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Fejl under åbning af kalender"
@@ -4087,16 +4123,16 @@ msgstr "Du har ikke rettigheder til at åbne kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke åbne mappen i \"%s\""
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Typen af visning der skal bruges"
 
@@ -4162,11 +4198,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "ekstra gange hver"
 
-#: 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 "timer"
 
-#: 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 "minutter"
 
@@ -4189,11 +4225,11 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
-#: 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 "Vis en besked"
 
-#: 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 "Afspil en lyd"
 
@@ -4202,17 +4238,17 @@ msgstr "Afspil en lyd"
 msgid "Reminders"
 msgstr "Påmindelse"
 
-#: 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 "Kør et program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr "Send et e-brev"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Send en besked"
 
 #: 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 "Sammendrag:"
@@ -4243,7 +4279,7 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: 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 "minutt(er)"
 
@@ -4253,8 +4289,8 @@ msgstr "start på aftale"
 
 #. 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 "Aktiveret"
 
@@ -4270,19 +4306,19 @@ msgstr "Fjern ikke"
 
 #: 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 "Deaktivér"
 
 #: 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 "Aktivér"
 
@@ -4306,7 +4342,7 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: 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 "Advarsler"
 
@@ -4331,7 +4367,7 @@ msgid "Days"
 msgstr "Dage"
 
 #: 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 "A_ktivér"
 
@@ -4427,7 +4463,7 @@ msgid "Wednesday"
 msgstr "Onsdag"
 
 #: 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 "Arbejdsuge"
 
@@ -4474,7 +4510,6 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4576,7 +4611,7 @@ msgstr ""
 "Klik på knappen \"Afslut\" for at gemme de indstillinger du har angivet her."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Opgaveliste"
@@ -4750,28 +4785,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfejl: %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 " til "
 
-#: 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 " (Fuldført "
 
-#: 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 "Fuldført "
 
-#: 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 " (Færdig "
 
-#: 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 "Færdig "
 
@@ -4807,8 +4842,9 @@ msgstr "Journalopføring - %s"
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: 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 "Gem som..."
 
@@ -4826,35 +4862,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Kan ikke hente versionsdata!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Kunne ikke åbne den delte mappe: %s."
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Aflys operation"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Vælg en målmappe til at importere data"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Opgaveliste"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4883,19 +4904,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil slette denne journalopføring uden titel?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Er du sikker på at du vil slette %d aftaler?"
+#, 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] "Er du sikker på at du vil slette %d aftaler?"
+msgstr[1] "Er du sikker på at du vil slette %d aftaler?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Er du sikker på at du vil slette %d opgaver?"
+#: 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] "Er du sikker på at du vil slette %d opgaver?"
+msgstr[1] "Er du sikker på at du vil slette %d opgaver?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Er du sikker på at du vil slette %d journalopføringer?"
+#: 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] "Er du sikker på at du vil slette %d journalopføringer?"
+msgstr[1] "Er du sikker på at du vil slette %d journalopføringer?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4962,7 +4989,7 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: 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 "Aftale"
 
@@ -5035,8 +5062,6 @@ msgstr "K_alender:"
 
 #: 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 "Klassificering"
 
@@ -5091,13 +5116,13 @@ msgstr "_Start-tid:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ingen"
 
@@ -5154,13 +5179,13 @@ msgid "Member"
 msgstr "Medlem"
 
 #: 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 "SU"
 
 #: 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
@@ -5346,7 +5371,7 @@ msgid "_No recurrence"
 msgstr "I_ngen genindtræffelse"
 
 #: 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 "Fje_rn"
 
@@ -5389,7 +5414,7 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: 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 "_Forkast ændringer"
 
@@ -5398,6 +5423,28 @@ msgstr "_Forkast ændringer"
 msgid "Save Event"
 msgstr "Kalenderhændelser"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Vælg importør"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Vælg en målmappe til at importere data"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Opgaveliste"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Mødesinformationen er blevet genereret. Send den?"
@@ -5427,39 +5474,39 @@ msgstr "% færdig"
 #: 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 "Fuldført"
 
 #: 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 "Høj"
 
 #: 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 "I gang"
 
 #: 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 "Lav"
 
 #: 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 "Ikke startet"
 
@@ -5475,7 +5522,7 @@ msgstr "Udefineret"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Dato for fuldførelse:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5519,9 +5566,9 @@ msgstr "Kunne ikke åbne adressebogen"
 msgid "Con_fidential"
 msgstr "Kon_fidensiel"
 
-#: 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 "Beskrivelse:"
 
@@ -5531,11 +5578,13 @@ msgid "Folder:"
 msgstr "_Mappe:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Sta_rt dato:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "Fær_dig-dato:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5595,138 +5644,112 @@ msgid "Weekly"
 msgstr "Uge"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d dage"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 dag"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d uger"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 uge"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d timer"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 time"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutter"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dage"
+msgstr[1] "%d dage"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minut"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d uger"
+msgstr[1] "%d uger"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekunder"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d timer"
+msgstr[1] "%d timer"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekund"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutter"
+msgstr[1] "%d minutter"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Send en besked"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunder"
+msgstr[1] "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukendt handling som skal udføres"
 
-#: 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 før aftalen starter"
 
-#: 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 efter aftalen er startet"
 
-#: 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 ved aftalens start"
 
-#: 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 før aftalen slutter"
 
-#: 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 efter aftalens slutning"
 
-#: 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 ved aftalens slutning"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %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 en ukendt udløsertype"
 
-#: 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 "Offentlig"
 
-#: 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 "Privat"
 
-#: 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 "Fortroligt"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Beskrivelse:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Slutdato"
 
-#: 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 "Startdato"
 
-#: 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 "Sammendrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "farve"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Aftale"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Ledig"
@@ -5762,141 +5785,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 "Ja"
 
-#: 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 "Nej"
 
 #. 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 "Ukendt"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Genindtræffer"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Sletter de valgte objekter"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Opdaterer objekter"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Ny _aftale..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Ny aftale som varer h_ele dagen"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Nyt møde"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Ny opgave"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "S_kriv ud..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Indsæt"
-
-#: 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 "Gå _til i dag"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Gå til dato..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Udgiv ledig/optaget-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:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Åbn"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Gem _som..."
-
-#: 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 "Klip _ud"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopiér"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Book møde..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Videresend som iCalendar..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Slet denne _hændelse"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Slet _alle hændelser"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Indstillinger..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5941,33 +5862,86 @@ 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 "Sletter de valgte objekter"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Opdaterer objekter"
+
+#: 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 "_Åbn"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Åbn besked"
 
-#: 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 "Gem _som..."
+
+#: 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 "S_kriv ud..."
+
+#: 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 "Klip _ud"
+
+#: 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 "_Kopiér"
+
+#: 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 "_Indsæt"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: 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 "Sle_t valgte opgaver"
 
-#: 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 "Klik for at tilføje en opgave"
 
@@ -5976,38 +5950,101 @@ msgstr "Klik for at tilføje en opgave"
 msgid "% Complete"
 msgstr "% færdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmer"
-
-#: 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 "Fuldført"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Fuldført dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Færdig-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Geografisk placering"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Startdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: 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 "Ny _aftale..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Ny aftale som varer h_ele dagen"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Nyt møde"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Ny opgave"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Vælg _tråd"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Slet..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Udgiv ledig/optaget-information"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Kopiér til mappe..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Fl_yt til mappe..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Book møde..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Videresend som iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Slet denne _hændelse"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Slet _alle hændelser"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Gå _til i dag"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Gå til dato..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Indstillinger..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6039,26 +6076,26 @@ msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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 " "
 
 #. 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 " "
@@ -6067,106 +6104,98 @@ msgstr " "
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Kompleks genindtræffelse)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Hver dag"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Hver %d. dag"
+msgid_plural "Every %d days"
+msgstr[0] "Hver dag"
+msgstr[1] "Hver dag"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Hver uge"
+msgid_plural "Every %d weeks"
+msgstr[0] "Hver uge"
+msgstr[1] "Hver uge"
 
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Hver %d. uge"
-
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Hver uge på "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Hver uge på "
+msgstr[1] "Hver uge på "
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Hver %d uge på "
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s. dag af "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s af "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "hver månede"
+msgid_plural "every %d months"
+msgstr[0] "hver månede"
+msgstr[1] "hver månede"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Hver år"
+msgid_plural "Every %d years"
+msgstr[0] "Hver år"
+msgstr[1] "Hver år"
 
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Hver %d. år"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " i alt %d gange"
+#: 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] " i alt %d gange"
+msgstr[1] " i alt %d gange"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", sluttende på "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Begynder:</b>"
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:<b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Færdig:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Udføres inden:</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-fejl"
 
-#: 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 "en ukendt afsender"
 
 #. 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."
@@ -6174,313 +6203,317 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Sted:"
+
 #. 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 "Accepteret"
 
-#: 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 "Preliminært godtaget"
 
-#: 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 "Afslået"
 
-#: 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 "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: 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 "O.k."
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: 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> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: 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> ønsker at %s er til stede ved et møde."
 
-#: 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> beder om din tilstedeværelse i et møde."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: 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> ønsker at tilføje information til et eksisterende møde."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: 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> ønsker at modtage seneste mødeinformation."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: 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> har svaret på en mødeforespørgsel."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: 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> har aflyst et møde."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: 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> har sendt en uforståelig besked."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: 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> har offentliggjort information om en opgave."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: 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> ønsker at %s udfører en opgave."
 
-#: 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> anmoder om at du udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: 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> ønsker at tilføje information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: 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> ønsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: 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> har svaret på en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: 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> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: 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> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: 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> anmoder om din oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: 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> har svaret på en forespørgsel efter oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: 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 "Meddelelsen ser ikke ud til at være korrekt udformet"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: 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 "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\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 ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer"
 
-#: 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 "Objektet er ugyldigt og kan ikke opdateres\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 ""
 "Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?"
 
-#: 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 "Deltagerstatus kunne ikke opdateres pga. ugyldig 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 "Der opstod en fejl i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\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 "Du har ikke rettigheder for at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: 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 "Elementet sendt!\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 "Elementet kunne ikke sendes!\n"
 
@@ -6615,7 +6648,7 @@ msgstr "%a %d/%m-%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m-%Y"
 
@@ -6701,12 +6734,12 @@ msgstr "_Prioritet:"
 msgid "Web Page:"
 msgstr "Side"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klik for at tilføje en opgave"
 
-#: 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"
@@ -6716,7 +6749,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"
@@ -6724,12 +6757,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6738,47 +6771,49 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Indlæser billeder"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ingen aftaler."
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Indlæser billeder"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Åbn i %s..."
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6800,45 +6835,46 @@ msgid "February"
 msgstr "Februar"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Gå til dato"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Marts"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Maj"
 
-#: 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 "Oktober"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Vælg navn"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Gå til i dag"
+msgid "_Select Today"
+msgstr "Vælg mappe"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6920,7 +6956,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7077,81 +7113,81 @@ msgid "Sa"
 msgstr "Lør"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %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 %d %b"
 
-#: 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 %d %b %Y"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Opgave"
 
-#: 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 "Prioritet: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Færdige procenter: %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 "Kategorier: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: 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 "Forhåndsvisning af udskrift"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
@@ -7160,39 +7196,39 @@ msgstr "Printeropsætning"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8836,7 +8872,7 @@ msgstr "Kan ikke oprette cachesøgesti"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunne ikke fjerne cacheindgangen: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8847,7 +8883,7 @@ msgstr ""
 "Videre operationer på denne server vil ikke kunne afspilles, når\n"
 "du kobler til dette netværk igen."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8858,7 +8894,7 @@ msgstr ""
 "%s\n"
 "Ændringer i denne mappe vil ikke blive resynkroniseret."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Resynkroniserer med server"
 
@@ -8875,7 +8911,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappen \"%s\" til afkoblet tilstand"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldføre denne operation"
 
@@ -8990,30 +9026,34 @@ msgstr "(match-all) kræver et enkelt boolsk resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Udfører forespørgsel på ukendt header: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Uunderstøttet operation: tillæg besked: for %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Flytter beskeder"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Kopierer meddelelser"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Henter %d beskeder"
@@ -9048,7 +9088,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 "Afbrudt."
 
@@ -9423,7 +9464,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -9624,7 +9665,7 @@ msgstr "Tolkningsfejl"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Type: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 
@@ -9633,21 +9674,22 @@ msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Affald"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Juni"
@@ -9879,17 +9921,17 @@ msgstr "Ingen sådan besked %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
@@ -9925,33 +9967,32 @@ msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Hent nye beskeder _automatisk hver(t)"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Servernavn"
+msgid "Address Book And Calendar"
+msgstr "Adressebog"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Udgangspunkt for søgning:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Adgangskode"
 
-#: 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."
@@ -9959,8 +10000,8 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Tyk tåge"
@@ -9968,12 +10009,12 @@ msgstr "Tyk tåge"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -10031,12 +10072,12 @@ msgstr "Mappen blev ødelagt og genskabt på serveren."
 msgid "Scanning for changed messages"
 msgstr "Søger efter ændrede beskeder"
 
-#: 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 "Kan ikke hente meddelelse: %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
@@ -10052,25 +10093,25 @@ msgstr ""
 "Kan ikke hente besked: %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 "Ingen sådan besked"
 
-#: 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 "Denne besked er ikke tilgængelig"
 
-#: 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 "Henter sammendragsinformation for nye beskeder"
 
-#: 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 "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -10146,18 +10187,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For læsning og lagring af e-post på IMAP-servere."
 
-#: 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-tjeneste for %s på %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
@@ -10167,15 +10208,15 @@ msgstr "IMAP-tjeneste for %s på %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %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
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "TLS er ikke tilgængelig"
 
-#: 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
@@ -10183,49 +10224,49 @@ msgstr "TLS er ikke tilgængelig"
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
-#: 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 "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %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-udvidelsen understøttes ikke."
 
-#: 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-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s understøtter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen understøtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10236,32 +10277,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%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:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
@@ -10294,20 +10336,20 @@ msgid "Index message body data"
 msgstr "Send besked til kontakt"
 
 #. $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 "postkasse:%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)"
@@ -10367,7 +10409,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"
@@ -10416,8 +10458,8 @@ msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
@@ -10447,14 +10489,14 @@ msgstr "Ugyldig beskedsindhold"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Finder ikke mappe: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
@@ -10473,7 +10515,7 @@ msgstr "`%s' er ikke en maildir katalog."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
@@ -10482,28 +10524,28 @@ msgstr "Kunne ikke slette mappe `%s': %s"
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke søge i mappe `%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 "Kan ikke åbne maildir katalogsti: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Kontrollerer mappekonsistens"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Checker for nye meddelelser"
 
-#: 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
@@ -10551,7 +10593,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikke oprette en mappe med det navn"
@@ -10582,32 +10624,32 @@ msgstr "`%s' er ikke en normal fil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
@@ -10651,7 +10693,7 @@ msgstr "Kunne ikke lukke kildemappe %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke ændre navn på mappe: %s"
@@ -10694,14 +10736,14 @@ msgstr "Tilføjet brev er annulleret"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Finder ikke mappe: %s: %s"
@@ -10989,47 +11031,47 @@ msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Ukendt fejl: %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 "Der findes ingen sådan mappe: %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 "Kunne ikke hente gruppe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Kunne ikke sende beskeden: %s"
 
-#: 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-kommandoen mislykkedes: %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: Skanner nye meddelelser"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukendt serversvar: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Anvend afbryd"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlingen mislykkedes: %s"
@@ -11076,7 +11118,7 @@ msgstr "Slet efter %s dage"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11166,7 +11208,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen sådan mappe `%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"
 
@@ -11220,12 +11262,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: 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 levering af e-post via en ekstern e-postserver med SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11343,13 +11386,14 @@ msgid "server does not appear to support SSL"
 msgstr "serveren ser ikke ud til at understøtte SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS-forespørgslen gav time-out: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP-kommando mislykkedes: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "Fejl i STARTTLS-svar"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP-kommando mislykkedes: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11383,153 +11427,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Kan ikke sende besked: ingen modtagere definerte."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: 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 "Kan ikke sende meddelelse: en eller flere ugyldige modtagere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO-forespørgsel gav time-out: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "Fejl i HELO-svar"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: 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 "Tidsafbrud for AUTH-forespørgsel: %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-kommando mislykkedes: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH-forespørgsel mislykkedes."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP-kommando mislykkedes: %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 "Ugyldig svar på autenticering fra 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 "Tidsafbrud for \"MAIL FROM\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "Fejl i MAIL FROM-svar"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP-kommando mislykkedes: %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 "Tidsafbrud for \"RCPT TO\"-forespørgsel: %s: besked ikke sendt"
 
-#: 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> mislykkedes"
 
-#: 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 "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
 
 #. 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 "Fejl i DATA-svar"
-
-#: 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 "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "Fejl i DATA-termineringssvar"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP-kommando mislykkedes: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Tidsafbrud for RSET-forespørgsel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "Fejl i RSET-svar"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT-forespørgslen gav time-out: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "Fejl i QUIT-svar"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP-kommando mislykkedes: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: 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 "bilag"
 
-#: 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 "Fjern valgte opføringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Tilføj bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Vedlæg en fil til beskeden"
 
-#: 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 "Kan ikke vedlægge fil %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 "Kan ikke vedlægge fil %s: ikke en almindelig fil"
@@ -11551,23 +11599,23 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Du skal konfigurere en konto\n"
 "inden du kan skrive e-post."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postdestination"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Vedlæg en fil til beskeden"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Klik her for at få adressebogen op"
 
@@ -11578,45 +11626,45 @@ msgstr "Klik her for at få adressebogen op"
 #. * 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 "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: 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 "Indtast adresserne som skal modtage en kopi af beskeden"
 
-#: 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."
@@ -11627,11 +11675,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Send til:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<klik her for at vælge en mappe>"
@@ -11640,19 +11688,19 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11661,30 +11709,30 @@ msgstr ""
 "Fejl under læsning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: 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 "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indlæsning af fil: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11693,7 +11741,7 @@ msgstr ""
 "Kunne ikke søge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11702,7 +11750,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %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"
@@ -11711,7 +11759,7 @@ msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11720,7 +11768,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11729,7 +11777,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du prøve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11741,42 +11789,47 @@ msgstr ""
 "Vil du gemme dine ændringar?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Besked uden titel)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: 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 "Automatisk genereret"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: 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."
@@ -11784,7 +11837,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adresseudvælgelses-kontrol kunne ikke aktiveres."
 
-#: 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"
@@ -11796,7 +11849,7 @@ msgstr ""
 "Verficér at du har de rette versioner af\n"
 "gtkhtml og libgtkhtml installeret.\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."
@@ -11804,7 +11857,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11928,7 +11981,7 @@ msgstr ""
 "Når du modtager en e-post med anmodning om læsningskvittering, hvad bør "
 "Evolution gøre?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11936,15 +11989,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk denne adgangskode for resten af denne session"
 
@@ -12027,13 +12080,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12042,118 +12095,106 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%H"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 sekund siden"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d sekunder siden"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 sekund siden"
+msgstr[1] "1 sekund siden"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 minut siden"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minut siden"
+msgstr[1] "1 minut siden"
 
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d minutter siden"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 time siden"
+msgid_plural "%d hours ago"
+msgstr[0] "1 time siden"
+msgstr[1] "1 time siden"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d timer siden"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 dag siden"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d dage siden"
+msgid_plural "%d days ago"
+msgstr[0] "1 dag siden"
+msgstr[1] "1 dag siden"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 uge siden"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d uger siden"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 uge siden"
+msgstr[1] "1 uge siden"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 måned siden"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d måneder siden"
+msgid_plural "%d months ago"
+msgstr[0] "1 måned siden"
+msgstr[1] "1 måned siden"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 år siden"
+msgid_plural "%d years ago"
+msgstr[0] "1 år siden"
+msgstr[1] "1 år siden"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d år siden"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Du skal vælge en dato."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<klik her for at vælge en dato>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "nu"
 
 #. 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 "Vælg en tid at sammenligne med"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Filterregler"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Du skal angive et filnavn."
 
-#: 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 "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Vælg en fil"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Så"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Udføres inden:</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Du skal angive en mappe."
 
-#: 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 "Vælg mappe"
 
@@ -12167,23 +12208,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 "Vigtig"
 
 #. 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 "At-gøre"
 
 #. 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 "Senere"
 
-#: 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"
 
@@ -12191,59 +12232,64 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Du skal give navn til dette filter."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Hvis"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Udføres inden:</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Udfør handlinger"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er mødt"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "hvis nogen betingelser er opfyldt"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "udgående"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Sammenlign med"
+#, fuzzy
+msgid "    "
+msgstr "      "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Rediger filtre"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filterregler"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Rediger Virtuelle-mapper"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vFolder kilder"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Sammenlign med"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Indkommende"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Udgående"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12251,7 +12297,7 @@ msgstr ""
 "Meddelelsesdatorn vil blive sammenlignet med\n"
 "klokken 12.00 på den angivne dato."
 
-#: 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."
@@ -12260,7 +12306,7 @@ msgstr ""
 "en tid som er relativ til den når filtret\n"
 "kørs."
 
-#: 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."
@@ -12268,59 +12314,51 @@ msgstr ""
 "Meddelelsedatoen vil blive sammenlignet med\n"
 "den aktuelle tiden når filtreringen kørs."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtuelle mapper"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "en tid relativ til tiden nu"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "måneder"
 
-#: 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 " sekunder"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "kun specifikke mapper"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "tiden nu"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "den tid du angiver"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vFolder kilder"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "uger"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "år"
 
@@ -12454,7 +12492,7 @@ msgstr "er ikke markeret med flag"
 msgid "Junk Test"
 msgstr "Juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12486,8 +12524,9 @@ msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Send meddelelse igennem skalkommando"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Afslut programmet"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12521,23 +12560,24 @@ msgstr "returnerer større end"
 msgid "returns less than"
 msgstr "returnerer mindre end"
 
-#: 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 "Kør 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 "Point"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Sæt status"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Skalkommando"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
@@ -12562,9 +12602,9 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Emne"
@@ -12573,17 +12613,13 @@ msgstr "Emne"
 msgid "Unset Status"
 msgstr "Neutraliser 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 "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Regler"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Tilføj regel"
 
@@ -12595,8 +12631,9 @@ msgstr "Rediger regel"
 msgid "Rule name"
 msgstr "Regelnavn"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Pointregler"
 
 #: filter/searchtypes.xml.h:1
@@ -12631,15 +12668,20 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuelle mapper"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Du skal give navn til denne 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 "Du skal specificere mindst en mappe som kilde."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "Kilde for virtuel mappe"
 
@@ -12690,8 +12732,8 @@ msgstr "Evolution e-post-mappevisning"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-post-indstillings-styreelement"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Post"
@@ -12700,53 +12742,50 @@ msgstr "Post"
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: 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 "E-post-indstillinger"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne konto?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Slet ikke"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokol"
 
-#: 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 "Navnløs"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Du skal angive et gyldigt skriptnavn."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[skript]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Sprog"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Tilføj skriptsignatur"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Tilføj signatur"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -12802,7 +12841,7 @@ msgstr ""
 "Kunne ikke åbne skitse-mappen for denne konto.\n"
 "Vil du bruge standard skitse-mappe?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra søgning..."
 
@@ -12836,410 +12875,440 @@ msgstr "Næste _ulæste meddelelse"
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vælge en mappe>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Opret ny mappe"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificér hvor mappen skal oprettes:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Indlæser..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Fjerner mappe %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Åbner mappe %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Flytter beskeder til %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Kopierer beskeder til %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Gemmer mappe '%s'"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Opret en ny mappe"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Skal mappen \"%s\" virkelig fjernes?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slet \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Åbn i nyt vindue"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Flyt"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "Omdøb"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Føl_g op..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Marker færdi_ge med flag"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Neutralis_er flag"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_kér som læst"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Markér som uvi_gtig"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Anvend filtre"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Filterregler"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe på e-post-_liste"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på em_ne"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filtrér på afsen_der"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filtrér på modta_gere"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på afsen_der"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiér henvisning"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik for at tilføje en opgave"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Træffere:"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Tildelt"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "Redigér signatur"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Redigér signatur"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Afbrudt"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "Kryptér med PGP"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Overskredet:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis indlejret"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Skjul"
@@ -13249,128 +13318,164 @@ msgstr "Skjul"
 msgid "Page %d of %d"
 msgstr "Side %d af %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
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter besked %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%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 "Peger til lokal fil (%s) gyldig på netsted \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne 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 "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flytter beskeder"
 
-#: 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 "Fra"
 
-#: 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 "Svar-til"
 
-#: 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 "Til"
 
-#: 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:"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: 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-bilag"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Et ikke understøttet skema"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Kan ikke verificere bladsignatur"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Kan ikke verificere bladsignatur"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Hver år"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "_En dag"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "_En uge"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "E_n måned"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13379,22 +13484,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Kunne ikke cache %s: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Kunne ikke cache %s: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
@@ -13437,34 +13542,34 @@ msgstr "Tilføj afsenderen i adressebogen"
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: 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 "Mappe"
 
 #. 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 "Venligst vælg en server."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13473,27 +13578,27 @@ msgstr ""
 "Fejl under indlæsning af filter-information:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Videresendt besked"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: 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"
@@ -13502,7 +13607,7 @@ msgstr ""
 "Kan ikke gemme til \"%s\":\n"
 " %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13511,38 +13616,38 @@ msgstr ""
 "\"%s\" findes allerede.\n"
 "Vil du overskrive den?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Besked"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gem besked som..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "Adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "E-post fra %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13556,7 +13661,7 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse meddelelser?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13637,275 +13742,309 @@ msgstr "Standard-emne for beskeden"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Standard-emne for beskeden"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "_Svarsstil:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Slå visning af mappelinjen fra/til"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Slå visning af mappelinjen fra/til"
 
-#: 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 "Slå visning af mappelinjen fra/til"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "E-post-konti"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Udfør handlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Notifikation om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Notifikation om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Send HTML-baseret e-post?"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Send HTML-baseret e-post?"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Vis animerede billeder"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Vis animerede billeder"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Vis besked i normal stíl"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Forhåndsvisningsvindue"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Spil lydfil når ny post ankommer"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Stave_kontrol"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminalskrifttype:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: 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;"
@@ -13913,113 +14052,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Beskedsliste med tråde"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Beskedsliste med tråde"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Gør dette til min standardkonto"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "V_ariabel bredde:"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Importér"
@@ -14059,14 +14198,14 @@ msgstr "Evolution importerer gammel e-post fra Elm"
 #: 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 "Importerer..."
 
 #: 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 "Venligst vent"
 
@@ -14115,12 +14254,12 @@ msgstr "Importerer filer"
 msgid "Scanning %s"
 msgstr "Søger i %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter \"%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"
@@ -14146,7 +14285,7 @@ msgstr ""
 "Kontroller de importerede filtre for at sikre dig at\n"
 "alting stadigvæk fungerer som tiltænkt."
 
-#: 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"
@@ -14158,7 +14297,7 @@ msgstr ""
 "tråd\", som ikke understøttes i Evolution.\n"
 "Disse filtre vil blive forkastet."
 
-#: 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"
@@ -14172,24 +14311,24 @@ msgstr ""
 "ændredes til at teste hvorvidt strengen findes\n"
 "eller ikke findes i meddelelseteksten."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "E-post-filtre"
 
-#: 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?"
@@ -14222,62 +14361,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Nuværende lagringsformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Indeksér meddelelsers indhold"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nyt lagringsformat:"
-
-#: 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 ""
-"Bemærk: Ved konvertering mellem postboksformater, kan en fejl\n"
-"(så som mangel på diskplads) ikke nødvendigvis rettes op\n"
-"igen. Venligst brug denne funktion med forsigtighed."
-
-#: 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 "Du har ikke udfyldt al nødvendig 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 "Kontoredigering for Evolution"
 
-#: 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 "_Vært:"
 
-#: 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 "Bruger_navn:"
 
-#: 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 "S_ti:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
@@ -14310,11 +14415,11 @@ msgstr "Svaret til"
 msgid "Add Filter Rule"
 msgstr "Tilføj filterregel"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Følgende filterregler:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14325,47 +14430,47 @@ msgstr ""
 "    \"%s\"\n"
 "og er blevet opdateret."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-post-filtre"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Opret en ny mappe"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: 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 "Identitet"
 
-#: 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 "
@@ -14375,11 +14480,12 @@ msgstr ""
 "nedenfor er ikke obligatoriske, medmindre du ønsker at inkludere "
 "informationen i den e-post du sender."
 
-#: 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 "Modtager post"
 
-#: 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."
@@ -14388,15 +14494,15 @@ msgstr ""
 "ikke er sikker bør du spørge din systemadministrator eller "
 "Internetleverandør."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: 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."
@@ -14404,11 +14510,11 @@ msgstr ""
 "Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør "
 "du spørge din systemadministrator eller Internetleverandør."
 
-#: 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 "Håndtering af konti"
 
-#: 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 "
@@ -14421,125 +14527,258 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: 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 "Kobler til 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 "_Søg efter understøttede typer"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Forhåndsvis"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL understøttes ikke i denne udgave af Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "(SSL er ikke understøttet i denne version af evolution)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL er ikke understøttet i denne version af 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>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "Kryptér altid til mig selv ved sending af krypteret e-post."
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Kontoredigeringsværktøj"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Kontoinformation"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Ser efter nye beskeder"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Tilføj sk_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Tilføj ny signatur..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Kryptér a_ltid til mig selv når krypteret post sendes"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Send altid en _blindkopi (Bcc) til:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Send altid en _kopi (Cc) til:"
+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
+#, fuzzy
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "Besked som skal vises:"
+
+#: 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 "Notifikation om ny post"
+
+#: 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 "Sendte beskeder og udkast"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "Kryptér altid til mig selv ved sending af krypteret e-post."
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Kontoredigeringsværktøj"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Tilføj ny signatur..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Tilføj sk_ript"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Kryptér a_ltid til mig selv når krypteret post sendes"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Send altid en _kopi (Cc) til:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Send altid en _blindkopi (Bcc) til:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "_Altid signér udgående beskeder når denne konto bruges"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Stol altid på nøgler i min nøglering ved kryptering"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Vedhæft originalmeddelelse"
 
-#: 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 "Bilag"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autenticering"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "Indsæt _automatisk smiley-billeder"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Hent nye beskeder _automatisk hver(t)"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Bib når ny post ankommer"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Te_gnkodning:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "F_arver"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "_Søg efter understøttede typer"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Kontrollér stavning mens jeg skri_ver"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Ser efter nye beskeder"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Farve på _fejlstavede ord:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Redigerer meddelelser"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "F_arver"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Konfiguration"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Bekræft når en folder udrenses"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14555,279 +14794,264 @@ msgstr ""
 "\n"
 "Klik på \"Fuldfør\" for at gemme dine indstillinger."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Standardopførsel"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Standardtegn_kodning: "
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Fjerner post"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "_Altid signér udgående beskeder når denne konto bruges"
+msgid "Defaults"
+msgstr "_Standardværdier"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Citér ikke originalmeddelelse"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signér ikke _mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: 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 "Færdig"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "Udkast_mappe:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-post-konti"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "E-post-_adresse:"
 
-#: 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 "Tøm _affaldsmappe ved afslutning"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Kør kommando..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "<< Færre alternativer"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Skrifttypeegenskaber"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Formatér meddelelser i _HTML"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
 #, fuzzy
-msgid "H_eaders"
+msgid "HTML Mail"
+msgstr "_HTML-brev"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Toptekst"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Markér _citat med"
 
-#: 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 "Indlejret"
 
-#: 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 "Etiketter og farver"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Indlæser billeder"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Meddelelseredigeringsværktøj"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Meddelelsesvisning"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Beskedsskrifttype"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Notifikation om ny post"
-
-#: 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"
 msgstr ""
 "Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gange"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Yderligere information"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nøgleid:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Vælg en farve"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Spil lydfil når ny post ankommer"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: 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 "Udskrevne skrifttyper"
-
-#: 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 "Citér originalmeddelelse"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "H_usk denne adgangskode"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Husk denne adgangskode"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Sva_r-til:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Modtager e-post"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "_Modtagelsesmuligheder"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Husk denne _adgangskode"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Nødvendig information"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Genetablér standardalternativ"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Husk denne adgangskode"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "S_ikkerhed"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Standard-skrifttype:"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Sikker MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Vælg HTML-skrifttype med fast bredde"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Vælg HTML-skrifttype med variabel bredde"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Slet..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Mappe til sendte _beskeder:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Sendte beskeder og udkast"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Server kræver _godkendelse"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Serverkonfiguration"
-
-#: 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
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Signatur:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Signaturer"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Angiv _filnavn:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "Stave_kontrol"
 
-#: 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 "_Terminalskrifttype:"
+
+#: 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"
@@ -14837,7 +15061,7 @@ msgstr ""
 "din signatur. Navnet du angiver vil bare\n"
 "anvendas for visning."
 
-#: 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 "
@@ -14846,7 +15070,7 @@ msgstr ""
 "Denne side lader dig konfigurere opførsel af stavekontrol og sprog. Listen "
 "med sprog her viser kun de sprog for hvilke en ordbog er installeret."
 
-#: 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\""
@@ -14854,15 +15078,15 @@ msgstr ""
 "Indtast navnet via hvilket du vil referere til denne konto.\n"
 "For eksempel: \"Job\" eller \"Personlig\"."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14872,179 +15096,110 @@ msgstr ""
 "\n"
 "Klik \"Næste\" for at begynde. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Tilføj signatur"
 
-#: 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 "_Altid indlæs billeder fra nettet"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Autenticeringstype: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Godkendelsesstype: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Hent nye beskeder _automatisk hver(t)"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "Indsæt _automatisk smiley-billeder"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Bib når ny post ankommer"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Bekræft når en folder udrenses"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Standardsignatur:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Standardværdier"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notificér mig ikke når ny post ankommer"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Videresendelsesformat:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Fulde navn:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML-brev"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identitet"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "Juni"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Indlæs billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Gør dette til min standardkonto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Markér meddelelser som læste efter"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: 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 "Indlæs aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Spil lydfil når ny post ankommer"
-
-#: 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 "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spørg når meddelelser sendes med en _tom emnelinie"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Modtager post"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Genskab standardalternativer"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Slet..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Afsendelse af post"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Vis animerede billeder"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Signaturer"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Standard-skrifttype:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminalskrifttype:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Brug sikker anslutning (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minutt(er)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "farve"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15053,7 +15208,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15062,7 +15217,7 @@ msgstr ""
 "Fejl under udførsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbejder"
 
@@ -15070,132 +15225,131 @@ msgstr "Arbejder"
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Sender \"%s\""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Fejlet på besked %d af %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Kunne ikke afkode besked."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Henter %d beskeder"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Henter %d beskeder"
+msgstr[1] "Henter %d beskeder"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Gemmer %d beskeder"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Gemmer %d beskeder"
+msgstr[1] "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15204,7 +15358,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15213,11 +15367,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15226,25 +15380,21 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skeln mellem store og små bogstaver"
@@ -15257,87 +15407,81 @@ msgstr "Find i besked"
 msgid "Find:"
 msgstr "Find:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Søgning"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Redigér signatur"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Undtagelser"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: 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 "Sti: %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 & modtag e-post"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Afbryd _alle"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: 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 "Venter..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Kunne ikke gemme signaturfilen: %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"
@@ -15347,23 +15491,23 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Forkast ændringer"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Gem signatur"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Redigér signatur"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Angiv et navn for denne signatur."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Navn:"
 
@@ -15393,17 +15537,17 @@ msgstr "Videresendt besked"
 msgid "Invalid folder: `%s'"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opsætter vmappe: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15416,84 +15560,84 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Læst"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Højere"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Højest"
 
-#: 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 "I dag %H:%M"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: 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 "Genererer beskedsliste"
 
@@ -15541,7 +15685,7 @@ msgstr "Følg op"
 msgid "For Your Information"
 msgstr "For information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
@@ -15549,11 +15693,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -15578,7 +15722,8 @@ msgstr ""
 "Vælg en opfølgningshandling fra menuen \"Flag\"."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Skal leveres den:"
 
 #: mail/message-tags.glade.h:7
@@ -15800,7 +15945,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Aflys møde for denne opføring"
 
-#: 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 "Venligst vælg information du ønsker at importere:"
 
@@ -15825,26 +15970,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vælg importør"
 
-#: 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 "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importerer"
 
-#: 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 "Fejl under indlæsning af %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15853,35 +15998,35 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importer en enkelt fil"
 
-#: 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"
@@ -15889,26 +16034,26 @@ msgstr ""
 "Venligst vent...\n"
 "Søger efter eksisterende opsætning"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: 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 "Fra %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen udbyder tilgængelig for protokol `%s'"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg kunne ikke udføres."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Importér"
@@ -15917,7 +16062,7 @@ msgstr "Importér"
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Indstillinger for Evolution"
 
@@ -15951,11 +16096,11 @@ msgstr "Kunne ikke åbne den delte mappe: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke oprette den angivne delte mappe."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Starter 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 "
@@ -15964,11 +16109,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Intet mappenavn angivet."
@@ -16011,15 +16151,15 @@ msgstr "Bug buddy kunne ikke køres."
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution..."
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
@@ -16069,7 +16209,6 @@ msgstr "Afkrydsningsboks"
 
 #: 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 "Ny"
 
@@ -16126,16 +16265,17 @@ msgid "Create a new test item"
 msgstr "Opret en ny opgave"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Aktive opkoblinger"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik o.k. for at lukke disse forbindelser og gå frakoblet"
+msgid "Active Connections"
+msgstr "Aktive opkoblinger"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Følgende forbindelser er aktive:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik o.k. for at lukke disse forbindelser og gå frakoblet"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16258,28 +16398,28 @@ msgstr ""
 "Gennem denne assistent vil du ledes gennem import af\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importerere"
 
-#: 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ér"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Importér ikke"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Spørg mig ikke igen"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16318,7 +16458,7 @@ msgstr ""
 "vi\n"
 "venter med spænding på dine bidrag!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16326,49 +16466,49 @@ msgstr ""
 "Tack\n"
 "Ximians Evolution-hold\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Fortæl mig det ikke igen"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilgå Ximian Evolution-skallen."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Start i frakoblet tilstand"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Start i opkoblet tilstand"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gennemtving opgradering af konfigurationsfiler fra Evolution 1.0.x"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil."
 
-#: 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"
@@ -16377,50 +16517,61 @@ msgstr ""
 "%s: --online og --offline kan ikke bruges sammen.\n"
 "  Brug %s --help for mere 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
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vælg importør"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Fremgang"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Udtryk"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-post-adresse:"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Indtast adgangskode for %s"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Indtast adgangskode for %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Indtast adgangskode"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16626,7 +16777,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-ID eksisterer allerede"
@@ -16929,7 +17081,7 @@ msgstr "Flyt kontakter til en anden mappe..."
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: 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 "Indsæt fra klippebordet"
 
@@ -16938,8 +17090,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontakterne som skal skrives ud"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning af udskrift"
 
@@ -16988,13 +17140,13 @@ msgstr "Stop indlæsning"
 msgid "View the current contact"
 msgstr "Vis den aktuelle kontakt"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -17015,14 +17167,10 @@ msgid "_Save as VCard"
 msgstr "Gem _som VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Søg efter kontakter"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Vælg alt"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Send meddelelse til kontakt..."
 
@@ -17030,58 +17178,54 @@ msgstr "_Send meddelelse til kontakt..."
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slet aftalen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Slet denne hændelse"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Slet denne hændelse"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå tilbage"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå fremad"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Gå til _dato"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Gå til en specifik dato"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Gå til i dag"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Næste"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser kalenderen som skal skrives ud"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Forrige"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
@@ -17090,7 +17234,7 @@ msgstr "Udskriv denne kalender"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Udgiv ledig/optaget information for denne kalender"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
@@ -17102,35 +17246,55 @@ msgstr "Offentlig mappe som indeholder mødelser og hændelser"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Vælg navn"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Gå til en specifik dato"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Vælg mappe"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Vis detaljer"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Vis en uge"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: 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 "I dag"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Vis den aktuelle kontakt"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Uge"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Møde"
@@ -17401,7 +17565,7 @@ msgstr "Markér alle som l_æst"
 msgid "Mark all visible messages as read"
 msgstr "Markér alle synlige beskeder som læst"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Indsæt meddelelsen fra klippebord"
 
@@ -17570,312 +17734,314 @@ msgid "F_orward As..."
 msgstr "_Videresend"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Filterregler"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrér på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtrér på se_nder..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtrér på modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtrér på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Markér de valgte beskeder som uvigtige"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markér markerede meddelelser for opfølgning"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Følg _op..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen indlæsning af billeder i HTML-baseret e-post"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte besked i kroppen af en ny besked"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte besked citeret som et svar"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte besked til nogen"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte besked til nogen som et bilag"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Forøg tekstens størrelse"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Indlæs b_illeder"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Markér som _vigtig"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Markér som _ulæst"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som uv_igtig"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markér de valgte beskeder som læste"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Markér de valgte beskeder som vigtige"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Markér de valgte beskeder som uvigtige"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Markér de valgte beskeder som ulæste"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markér de valgte beskeder som ulæste"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markér de valgte beskeder som uvigtige"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Markér de valgte beskeder for sletning"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Flyt de valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Næste"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Næste _vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Næste _tråd"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Næste _ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Ikke fundet"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Åbn valgt besked i et nyt vindue"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Åbn valgt besked i redigeringsvinduet for at sende den igen"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Oprindelig _størrelse"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "F_oregående ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Post et svar"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar til en meddelelse i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Fo_regående vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis beskeden som skal skrives ud"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Forrige"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Udskriv denne besked"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "_Omdirigér"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdirigér (bounce) den markerede meddelelse til nogen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Nulstil tekststørrelsen til den oprindelige"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Søg i b_esked..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Gem beskeden som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Konfigurér sideindstillingerne for din aktuelle printer"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Vis brevets _kildetekst"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Vis besked i normal stíl"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Vis besked med fulde e-post-headere"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post-beskeden i sin rå form"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Tekst-større_lse"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Fortryd sletning af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuel mappe for e-post-_liste..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "Virtuel mappe for afse_nder..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "Virtuel mappe for modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "Virtuel mappe for e_mne..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Vedlagt"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Inlejret"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Næste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Åbn besked"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Foregående meddelelse"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Citeret"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "Send igen..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Værktøjer"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
@@ -18145,41 +18311,41 @@ msgstr "Kopiér valgt opgave"
 msgid "Cut selected task"
 msgstr "Klip valgt opgave ud"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Fjern færdiggjorte opgaver"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Slet valgte opgaver"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Mar_kér som færdig"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Indsæt opgave fra klippeborder"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Forhåndsgransker listen af opgaver som skal skrives ud"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Udskriv listen med opgaver"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Slet valgte opgaver"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Opgave"
@@ -18313,10 +18479,15 @@ msgid "_Day View"
 msgstr "_Dagsvisning"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Tilrettet visning"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Månedsvisning"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Arbejdsugesvisning"
 
@@ -18351,10 +18522,16 @@ msgid "_Messages"
 msgstr "Beskeder"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Med _kategori"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Fær_dig-dato:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Sæt status"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Opgaver"
 
@@ -18415,14 +18592,10 @@ msgstr "MTOTFLS"
 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 "nu"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "I dag"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18432,82 +18605,87 @@ msgstr "Datoen skal skrives ind på formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentværdien skal være mellem 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Central-europæisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Græsk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "UCS"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Vest-europæisk"
 
-#: 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 "Vest-europæisk"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Traditionel"
 
-#: 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 "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Visuel"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukendt tegnsæt: %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 "Tegnkodning"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Indtast tegnsæt som skal bruges"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Andre..."
 
@@ -18575,11 +18753,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Søg"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Redigering af søgning"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Gem søgning"
 
@@ -18600,15 +18783,15 @@ msgstr "_Avanceret..."
 msgid "Choose Image"
 msgstr "Vælg en fil"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Søg"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Søg nu"
 
-#: 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 "_Tøm"
 
@@ -18639,6 +18822,335 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
+#~ msgid "2:30"
+#~ msgstr "2.30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Adressbogskilder..."
+
+#~ msgid "Selected:"
+#~ msgstr "Valgt:"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Kontakt"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "og %d andre kort."
+
+#~ msgid "Send an Email"
+#~ msgstr "Send et e-brev"
+
+#~ msgid "1 day"
+#~ msgstr "1 dag"
+
+#~ msgid "1 week"
+#~ msgstr "1 uge"
+
+#~ msgid "1 hour"
+#~ msgstr "1 time"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minut"
+
+#~ msgid "1 second"
+#~ msgstr "1 sekund"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Beskrivelse:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Aftale"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmer"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Geografisk placering"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Hver %d. dag"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Hver %d. uge"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Hver %d uge på "
+
+#~ msgid "Every %d years"
+#~ msgstr "Hver %d. år"
+
+#~ msgid "Go To Date"
+#~ msgstr "Gå til dato"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Gå til i dag"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Servernavn"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_Udgangspunkt for søgning:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "STARTTLS-forespørgslen gav time-out: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "Fejl i STARTTLS-svar"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "HELO-forespørgsel gav time-out: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "Fejl i HELO-svar"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "Tidsafbrud for AUTH-forespørgsel: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH-forespørgsel mislykkedes."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Fejl i MAIL FROM-svar"
+
+#~ msgid "DATA response error"
+#~ msgstr "Fejl i DATA-svar"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
+
+#~ msgid "DATA termination response error"
+#~ msgstr "Fejl i DATA-termineringssvar"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "Tidsafbrud for RSET-forespørgsel: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "Fejl i RSET-svar"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "QUIT-forespørgslen gav time-out: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "Fejl i QUIT-svar"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d sekunder siden"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minutter siden"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d timer siden"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d dage siden"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d uger siden"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d måneder siden"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d år siden"
+
+#~ msgid "Then"
+#~ msgstr "Så"
+
+#~ msgid "If"
+#~ msgstr "Hvis"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Rediger filtre"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Rediger Virtuelle-mapper"
+
+#~ msgid "Outgoing"
+#~ msgstr "Udgående"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Send meddelelse igennem skalkommando"
+
+#~ msgid "Shell Command"
+#~ msgstr "Skalkommando"
+
+#~ msgid "Rules"
+#~ msgstr "Regler"
+
+#~ msgid "[script]"
+#~ msgstr "[skript]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Tilføj skriptsignatur"
+
+#~ msgid "Current store format:"
+#~ msgstr "Nuværende lagringsformat:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Indeksér meddelelsers indhold"
+
+#~ msgid "New store format:"
+#~ msgstr "Nyt lagringsformat:"
+
+#~ 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 ""
+#~ "Bemærk: Ved konvertering mellem postboksformater, kan en fejl\n"
+#~ "(så som mangel på diskplads) ikke nødvendigvis rettes op\n"
+#~ "igen. Venligst brug denne funktion med forsigtighed."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL understøttes ikke i denne udgave af Evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontoinformation"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticering"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Redigerer meddelelser"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Standardopførsel"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Fjerner post"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "<< Færre alternativer"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Etiketter og farver"
+
+#~ msgid "Loading Images"
+#~ msgstr "Indlæser billeder"
+
+#~ msgid "Message Display"
+#~ msgstr "Meddelelsesvisning"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Beskedsskrifttype"
+
+#~ msgid "Optional Information"
+#~ msgstr "Yderligere information"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Udskrevne skrifttyper"
+
+#~ msgid "Re_member this password"
+#~ msgstr "H_usk denne adgangskode"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Husk denne _adgangskode"
+
+#~ msgid "Required Information"
+#~ msgstr "Nødvendig information"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Genetablér standardalternativ"
+
+#~ msgid "S_ecurity"
+#~ msgstr "S_ikkerhed"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Sikker MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Serverkonfiguration"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Autenticeringstype: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Godkendelsesstype: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Standardsignatur:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Fulde navn:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identitet"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "Juni"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Modtager post"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Genskab standardalternativer"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Afsendelse af post"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Sender \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Fejlet på besked %d af %d"
+
+#~ msgid "Search"
+#~ msgstr "Søgning"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Redigér signatur"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Undtagelser"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Assistent"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Følgende forbindelser er aktive:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Søg efter kontakter"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Gå til _dato"
+
+#~ msgid "Go to today"
+#~ msgstr "Gå til i dag"
+
+#~ msgid "With _Category"
+#~ msgstr "Med _kategori"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Adressebogs-kilder"
 
@@ -18679,10 +19191,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Scanning directory"
 #~ msgstr "Søger i katalog"
 
-#, fuzzy
-#~ msgid "    "
-#~ msgstr "      "
-
 #~ msgid "Cannot copy folder: %s"
 #~ msgstr "Kan ikke kopiere mappe: %s"
 
@@ -18986,9 +19494,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "Redigér LDAP-server"
 
-#~ msgid "Select Names"
-#~ msgstr "Vælg navn"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Valgte kontakter:"
 
@@ -19025,10 +19530,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Kalenderinformation"
 
 #, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Besked som skal vises:"
-
-#, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Status:</b>"
 
@@ -19045,10 +19546,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Kalenderinformation"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Udføres inden:</b> "
-
-#, fuzzy
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "Arbejdsuge"
 
@@ -19085,10 +19582,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Kan ikke oprette katalog %s: %s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Forhåndsvis"
-
-#, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "Fremgang"
 
@@ -19388,9 +19881,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "New _Task"
 #~ msgstr "Ny opgave"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "Evolution _vindue"
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Evolution _vindue"
@@ -19788,9 +20278,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "No cards"
 #~ msgstr "Ingen kort"
 
-#~ msgid "1 card"
-#~ msgstr "1 kort"
-
 #~ msgid "%d cards"
 #~ msgstr "%d kort"
 
@@ -19860,9 +20347,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "_Save as..."
 #~ msgstr "_Gem som..."
 
-#~ msgid "End Date"
-#~ msgstr "Slutdato"
-
 #~ msgid "Print..."
 #~ msgstr "Udskriv..."
 
@@ -19899,9 +20383,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Failed to find a common bulk algorithm."
 #~ msgstr "Kunne ikke finde en normal bulk-algoritme."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "Kunne ikke afkode besked."
-
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Kunne ikke oprette et PGP-signaturkontekst"
 
@@ -20134,9 +20615,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "However, the message was successfully sent."
 #~ msgstr "Fuldførte alligevel sending af beskeden."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Besked uden titel)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Tom besked"
 
@@ -28382,12 +28860,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "News Feeds"
 #~ msgstr "_Nyhedstjenester"
 
-#~ msgid "One mont_h"
-#~ msgstr "E_n måned"
-
-#~ msgid "One w_eek"
-#~ msgstr "_En uge"
-
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "Opdat_eringstid (sekunder):"
 
@@ -28407,9 +28879,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Vis temperatur i:"
 
-#~ msgid "Tasks "
-#~ msgstr "Opgaver "
-
 #~ msgid "Weather Settings"
 #~ msgstr "Vejrindstillinger"
 
@@ -28431,9 +28900,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "_New Feed"
 #~ msgstr "_Nyhedstjenester"
 
-#~ msgid "_One day"
-#~ msgstr "_En dag"
-
 #, fuzzy
 #~ msgid "_Show full path for folders"
 #~ msgstr "V_is fuld sti for mapper"
diff --git a/po/de.po b/po/de.po
index 8efe315d3b..b22c908c5a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.2\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-01-25 17:07+0100\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -24,6 +24,47 @@ msgstr ""
 "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-Adressbuch"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Lokale Adressbuchordner auflisten"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Speichern unter"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "Karten"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "Karten"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakte: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution-Alarm"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Synchronisierungsadresse:"
@@ -103,76 +144,92 @@ msgstr ""
 "Das Adressbuch »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: 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 "Löschen"
 
-#: 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 "Eigenschaften..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "Ko_ntaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Neues Adressbuch"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Adressbuch"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Eine neue Aufgabe anlegen"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Verbindungsaufbau mit LDAP-Server gescheitert"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Legitimation am LDAP-Server gescheitert"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "Der Server antwortete mit nicht unterstützten Suchbasen"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Dieser Server unterstützt keine LDAPv3-Schemainformationen"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Fehler beim Abrufen der Schemainformationen"
 
-#: 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 antwortetet nicht mit einer gültigen Schemainformationen"
 
@@ -201,17 +258,17 @@ msgstr "»%s« wird migriert:"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Auf diesem Computer"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -268,7 +325,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
-#: 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."
@@ -276,7 +333,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad existiert und Sie darauf zugreifen dürfen."
 
-#: 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."
@@ -285,7 +342,7 @@ msgstr ""
 "Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
 "erreichbar ist."
 
-#: 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 "
@@ -296,7 +353,7 @@ msgstr ""
 "CVS-Quelltext kompilieren, nachdem Sie sich von untenstehendem Link OpenLDAP "
 "besorgt haben."
 
-#: 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."
@@ -305,28 +362,28 @@ msgstr ""
 "Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
 "ist."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch konnte nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonymer Zugriff auf LDAP-Server"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 
-#: 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 der Kontaktquelle, die diese Ansicht anzeigt"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
@@ -352,16 +409,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI des zuletzt im Namenswähler verwendeten Ordners"
 
 #: 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 "  Unterstützte Basen _anzeigen"
 
-#: 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
@@ -376,62 +427,53 @@ msgstr "  Unterstützte Basen _anzeigen"
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Assistent zum Anlegen eines Adressbuchs"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Adressbuchquellen..."
-
-#: 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 "Immer"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonym"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -445,53 +487,53 @@ msgstr ""
 "Bitte klicken sie den »Fertigstellen«-Knopf an, um die von Ihnen\n"
 "vorgenommenen Einstellungen zu speichern."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Eindeutiger _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: 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 verwendet diesen eindeutigen Namen, um Sie beim Server zu "
 "legitimieren"
 
-#: 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 verwendet diese E-Mail-Adresse, um Sie beim Server zu legitimieren"
 
-#: 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 "Beendet"
 
-#: 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 "Allgemein"
 
-#: 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 "Gruppe:"
 
-#: 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 "Nie"
 
-#: 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"
@@ -508,23 +550,19 @@ msgstr ""
 "Ihren\n"
 "Systemadministrator ob Ihr LDAP-Server diese Protokolle unterstützt."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Eins"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Suchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Gewählt:"
-
-#: 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"
@@ -534,7 +572,7 @@ msgstr ""
 "mit Ihrem\n"
 "LDAP-Server her, falls dieser SSL oder TLS unterstützt."
 
-#: 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"
@@ -551,7 +589,7 @@ msgstr ""
 "Ihre Verbindung bereits\n"
 "sicher ist."
 
-#: 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"
@@ -565,7 +603,7 @@ msgstr ""
 "Sie anfällig\n"
 "für Sicherheitslücken sind. "
 
-#: 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 "
@@ -576,7 +614,7 @@ msgstr ""
 "Suche auf LDAP-Servern sowie das Anlegen und Bearbeiten von Kontakten "
 "festlegen."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -586,32 +624,32 @@ msgstr ""
 "Sie müssen zunächst den angezeigten Namen und eine Gruppe für das Adressbuch "
 "eingeben."
 
-#: 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 "Schritt 1: Ordnermerkmale"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Schritt 2: Server-Informationen"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Schritt 3: Verbindungsaufbau mit Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Schritt 4: Das Verzeichnis durchsuchen"
 
-#: 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 "Unterstützte Suchbasen"
 
-#: 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"
@@ -624,7 +662,7 @@ msgstr ""
 "aufgenommen werden sollen und wie lange eine Suche dauern darf. Fragen\n"
 "Sie Ihren Systemadministrator, ob Sie diese Einstellungen ändern müssen."
 
-#: 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"
@@ -636,7 +674,7 @@ msgstr ""
 "Wenn Sie dieses Feld leer lassen, beginnt die Suche an der Wurzel des "
 "Verzeichnisbaums."
 
-#: 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"
@@ -652,7 +690,7 @@ msgstr ""
 "Der Suchbereich »one« hingegen schließt lediglich die Ebene unterhalb\n"
 "des Ausgangspunktes der Suche ein.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -669,7 +707,7 @@ msgstr ""
 "kontaktieren Sie Ihren Systemadministrator falls Sie Hilfe\n"
 "dabei brauchen, an diese Informationen zu gelangen."
 
-#: 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"
 "\"."
@@ -677,7 +715,7 @@ msgstr ""
 "Dies ist der vollständige Name des LDAP-Servers. Zum Beispiel: »ldap."
 "meinefirma.de«."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -687,7 +725,7 @@ msgstr ""
 "Dies ist die maximale Anzahl herunterzuladender Einträge. Wenn diese\n"
 "Zahl zu hoch angesetzt ist, werden Vorgänge im Adressbuch verlangsamt."
 
-#: 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 "
@@ -697,7 +735,7 @@ msgstr ""
 "Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
 "ist, wenn Sie dies auf »E-Mail-Adresse« einstellen."
 
-#: 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"
@@ -707,7 +745,7 @@ msgstr ""
 "angezeigt wird.\n"
 "Er dient lediglich zu Anzeigezwecken. "
 
-#: 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 "
@@ -716,7 +754,7 @@ msgstr ""
 "Dieser Name wird in der Ordnerliste von Evolution angezeigt und daher "
 "lediglich zu Anzeigezwecken verwendet."
 
-#: 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"
@@ -728,28 +766,28 @@ msgstr ""
 "Eine Liste der Standard-Ports wurde bereits angegeben. Fragen Sie\n"
 "Ihren Systemadministrator, welchen Port Sie angeben müssen."
 
-#: 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 "Dies legt fest, wie lange eine Suche ausgeführt wird."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TSL verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (EN) verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: 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 "Immer, wenn möglich"
 
-#: 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"
@@ -761,60 +799,48 @@ msgstr ""
 "Bitte fragen Sie Ihren Systemadministrator, wenn Sie sich bei diesen "
 "Einstellungen nicht sicher sind."
 
-#: 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 "Angezeigter _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Download-Begrenzung:"
 
-#: 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 "_Bearbeiten"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Anmeldemethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Port-Nummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Such_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Zeitüberschreitung (Minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "Karten"
 
-#: 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"
 
@@ -846,7 +872,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML-E-Mail verschicken?"
 
 #: 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 "Zu Kontakten hinzufügen"
 
@@ -862,7 +888,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 "Quelle"
 
@@ -929,7 +955,8 @@ msgstr "Zusammenarbeit"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -938,7 +965,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: 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"
@@ -1024,16 +1051,27 @@ msgstr "Ka_tegorien..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Löschen"
 
+#: 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 "_Bearbeiten"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "Zu _Hause:"
@@ -1075,22 +1113,22 @@ msgid "_Web page address:"
 msgstr "_Web-Adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2073,9 +2111,9 @@ msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2088,20 +2126,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:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Dienst"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Ort"
 
@@ -2110,113 +2149,97 @@ msgid "Username"
 msgstr "Benutzername"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Privat"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Geschäftlich"
 
 # CHECK
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Weitere"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Geändert"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Kontoname"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Der Kategorieeditor ist nicht verfügbar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Kontakt als VCard speichern"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Sind Sie sicher, dass Sie\n"
-"diese Kontakte löschen wollen?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sind Sie sicher, dass Sie\n"
-"diesen Kontakt löschen wollen?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Widget für ein Feld konnte nicht gefunden werden: »%s«"
@@ -2230,6 +2253,7 @@ msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Voller Name:"
 
@@ -2237,6 +2261,22 @@ msgstr "_Voller 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 ""
+"Sind Sie sicher, dass Sie\n"
+"diese Kontakte löschen wollen?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sind Sie sicher, dass Sie\n"
+"diesen Kontakt löschen wollen?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2"
@@ -2339,22 +2379,28 @@ msgid "_Title:"
 msgstr "Titel:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "Kontoname:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr "IM-Konto hinzufügen"
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "Kontoname:"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+#, fuzzy
+msgid "_IM Service:"
 msgstr "IM-Dienst:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Standort:"
 
+#: 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 "Mitglieder"
@@ -2377,25 +2423,26 @@ msgstr ""
 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 "Buch"
 
-#: 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 "Ist neue Liste"
 
 #. 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 "Kontaktlisteneditor"
 
-#: 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 "Liste als VCard speichern"
 
@@ -2448,23 +2495,21 @@ msgid "No contacts"
 msgstr "Keine Kontake"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 Kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d Kontakte"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d Kontakte"
+msgstr[1] "%d Kontakte"
 
-#: 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 "Abfrage"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
@@ -2476,132 +2521,131 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
-#: 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 "Kategorie ist"
 
 #. 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 "Ein beliebiges Feld enthält"
 
-#: 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 "Komplex..."
 
-#: 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 "Typ"
 
-#: 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 "Adressbuch"
 
-#: 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 "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Neuer Kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Neue Kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Gehe zu Ordner..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importvorgang..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Nach Kontakten suchen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbuchquellen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
-#: 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 "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressbuch..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressbuch..."
 
-#: 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 "Ausschneiden"
 
-#. 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 "Kopieren"
 
-#: 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 "Einfügen"
 
-#: 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 "Aktuelle Ansicht"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2614,7 +2658,7 @@ msgstr ""
 "können"
 
 #. 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 "Beliebige Kategorie"
@@ -2648,8 +2692,6 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: 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 "Kategorien"
 
@@ -2658,7 +2700,7 @@ msgid "Company Phone"
 msgstr "Firmentelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-Mail"
 
@@ -2709,6 +2751,7 @@ msgid "Manager"
 msgstr "Vorgesetzter"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -2717,7 +2760,7 @@ msgid "Nickname"
 msgstr "Spitzname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Notiz"
 
@@ -2726,7 +2769,7 @@ msgid "Office"
 msgstr "Büro"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2783,17 +2826,17 @@ msgid "Web Site"
 msgstr "Website"
 
 #: 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 "Breite"
 
 #: 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 "Höhe"
 
 #: 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 "Hat Fokus"
 
@@ -2845,89 +2888,92 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Gewählt"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Geschäftlich"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Beschreibung"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Gruppe"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "V_ideokonforenz-URL:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Persönlich"
+msgid "work"
+msgstr "Geschäftlich"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Persönlich"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Homepage"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Erfolg"
 
-#: 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
@@ -2935,94 +2981,94 @@ msgstr "Erfolg"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: 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 "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Kontakt nicht gefunden"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Kontaktkennung existiert bereits"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: 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 "Abgesagt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Legitimation gescheitert"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adressbuch existiert nicht"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: 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 "Fehler beim Hinzufügen eines Kontakts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: 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 "Fehler beim Entfernen eines Kontakts"
 
-#: 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"
@@ -3033,7 +3079,7 @@ msgstr ""
 "Wollen Sie wirklich all diese Kontakte anzeigen?"
 
 # CHECK der Kontakt -> diesen?
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3042,50 +3088,50 @@ msgstr ""
 "%s existiert bereits\n"
 "Möchten Sie diesen überschreiben?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fehler beim Speichern von %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 "Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Kontakte aus dem Adressbuch wählen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Mehrere 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 für %s"
@@ -3122,33 +3168,31 @@ msgstr "Adresse zu bestehendem Kontakt »%s« hinzufügen"
 msgid "Querying Address Book..."
 msgstr "Anfrage beim Adressbuch..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "und %d weitere Karten."
-
-#: 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 "und eine weitere Karte."
+msgid_plural "and %d other contacts."
+msgstr[0] "und eine weitere Karte."
+msgstr[1] "und eine weitere Karte."
 
-#: 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 "Gesamte VCard anzeigen"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Kompakt-VCard anzeigen"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
@@ -3299,7 +3343,7 @@ msgstr "Ränder"
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: 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 "Optionen"
 
@@ -3479,7 +3523,7 @@ msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
 #: 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 "Passwort eingeben"
 
@@ -3558,7 +3602,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution-Aufgabenkomponente"
 
 #: 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"
@@ -3604,25 +3648,25 @@ msgstr "Schlummerzeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: 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 "Öffnen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
 # CHECK
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3634,12 +3678,12 @@ msgstr ""
 "%sBeginnt um %s\n"
 "Endet um %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 "Warnung"
 
-#: 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"
@@ -3652,7 +3696,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: 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 "
@@ -3669,7 +3713,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: 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 "Nicht mehr nach diesem Programm fragen."
 
@@ -3837,13 +3881,13 @@ msgid "Location contains"
 msgstr "Beschreibung enthält"
 
 # CHECK
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: 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 "Kalender"
 
@@ -3861,7 +3905,7 @@ msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
 #: 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 "Tage"
 
@@ -3872,7 +3916,7 @@ 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.
 #: 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"
 
@@ -3894,74 +3938,74 @@ 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 ""
 "Der Kalender »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "_Ganztagstermin"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "Ka_lender"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: 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 ""
 "Der Kalender »%s« konnte nicht zum Anlegen von Ereignissen und Treffen "
 "geöffnet werden"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Es ist kein Kalender zum Anlegen von Ereignissen und Treffen verfügbar"
 
@@ -3991,10 +4035,6 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Listenansicht"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
@@ -4012,16 +4052,16 @@ msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 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 "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Typ der anzuzeigenden Ansicht"
 
@@ -4085,11 +4125,11 @@ msgstr "Dialog1"
 msgid "extra times every"
 msgstr "weitere Male alle"
 
-#: 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 "Stunden"
 
-#: 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 "Minuten"
 
@@ -4112,11 +4152,11 @@ msgstr "Grundlegend"
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
-#: 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 "Eine Nachricht anzeigen"
 
-#: 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 "Einen Klang abspielen"
 
@@ -4124,17 +4164,17 @@ msgstr "Einen Klang abspielen"
 msgid "Reminders"
 msgstr "Erinnerung"
 
-#: 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 "Ein Programm ausführen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
 #: 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 "Zusammenfassung:"
@@ -4165,7 +4205,7 @@ msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #: 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(n)"
 
@@ -4175,8 +4215,8 @@ msgstr "Beginn des Termins"
 
 #. 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 "Aktiv"
 
@@ -4190,19 +4230,19 @@ msgstr "Nicht entfernen"
 
 #: 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 "Deaktivieren"
 
 #: 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 "Aktivieren"
 
@@ -4226,7 +4266,7 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: 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 "Alarme"
 
@@ -4251,7 +4291,7 @@ msgid "Days"
 msgstr "Tage"
 
 #: 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 "_Aktivieren"
 
@@ -4346,7 +4386,7 @@ msgid "Wednesday"
 msgstr "Mittwoch"
 
 #: 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 "Arbeitswoche"
 
@@ -4391,7 +4431,6 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4493,7 +4532,7 @@ msgstr ""
 "vorgenommenen Einstellungen zu speichern."
 
 #: 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 "Neue Aufgabenliste"
 
@@ -4663,28 +4702,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %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 " bis "
 
-#: 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 " (Abgeschlossen "
 
-#: 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 "Abgeschlossen "
 
-#: 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 " (Fällig am "
 
-#: 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 "Fällig am "
 
@@ -4720,8 +4759,9 @@ msgstr "Journaleintrag - %s"
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: 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 "Speichern unter..."
 
@@ -4737,36 +4777,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "»%s« konnte nicht geöffnet werden: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Zielordner"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-# CHECK
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Wählen Sie eine Zielquelle"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Neue Aufgabenliste"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4796,19 +4820,25 @@ msgstr ""
 "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen wollen?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
+#, 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] "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
+msgstr[1] "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
+#: 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] "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
+msgstr[1] "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
+#: 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] "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
+msgstr[1] "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4878,7 +4908,7 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: 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 "Termin"
 
@@ -4951,8 +4981,6 @@ msgstr "Kalender:"
 
 #: 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 "Einstufung"
 
@@ -5003,13 +5031,13 @@ msgstr "_Anfangszeit:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Keine"
 
@@ -5066,13 +5094,13 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: 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 "UAwg"
 
 #: 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
@@ -5250,7 +5278,7 @@ msgid "_No recurrence"
 msgstr "_Keine Wiederholung"
 
 #: 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 "_Entfernen"
 
@@ -5293,7 +5321,7 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: 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 "Änderungen _verwerfen"
 
@@ -5301,6 +5329,29 @@ msgstr "Änderungen _verwerfen"
 msgid "Save Event"
 msgstr "Ereignis speichern"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Wählen Sie einen Importeur"
+
+# CHECK
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Wählen Sie eine Zielquelle"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Neue Aufgabenliste"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Die Besprechungsinformationen wurden erstellt. Jetzt verschicken?"
@@ -5335,39 +5386,39 @@ msgstr "% _abgeschlossen"
 #: 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 "Abgeschlossen"
 
 #: 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 "Hoch"
 
 #: 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 Bearbeitung"
 
 #: 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 "Niedrig"
 
 #: 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 "Nicht begonnen"
 
@@ -5381,7 +5432,8 @@ msgid "Undefined"
 msgstr "Nicht festgelegt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "A_bgeschlossen am:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5424,9 +5476,9 @@ msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
 msgid "Con_fidential"
 msgstr "_Vertraulich"
 
-#: 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 "Beschreibung:"
 
@@ -5435,11 +5487,13 @@ msgid "Folder:"
 msgstr "Ordner:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "_Anfangsdatum:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Fällig am:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5492,136 +5546,113 @@ msgid "Weekly"
 msgstr "Wöchentlich"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d Tage"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 Tag"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d Wochen"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 Woche"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d Stunden"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 Stunden"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tage"
+msgstr[1] "%d Tage"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 Minute"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d Wochen"
+msgstr[1] "%d Wochen"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d Sekunden"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d Stunden"
+msgstr[1] "%d Stunden"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 Sekunde"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d Minuten"
+msgstr[1] "%d Minuten"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Eine E-Mail verschicken"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d Sekunden"
+msgstr[1] "%d Sekunden"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Auszuführende Aktion unbekannt"
 
-#: 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 vor Terminbeginn"
 
-#: 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 nach Terminbeginn"
 
-#: 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 zum Terminbeginn"
 
-#: 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 vor Terminende"
 
-#: 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 nach Terminende"
 
-#: 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 zum Terminende"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %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 für einen unbekannten Auslösertyp."
 
-#: 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 "Öffentlich"
 
-#: 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 "Privat"
 
-#: 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 "Vertraulich"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Beschreibung"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Datum"
 
-#: 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 "Anfangsdatum"
 
-#: 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 "Zusammenfassung"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "Farbe"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "Komponente"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Frei"
@@ -5657,141 +5688,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 "Ja"
 
-#: 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 "Nein"
 
 #. 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 "Unbekannt"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Gewählte Objekte werden gelöscht"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Objekte werden aktualisiert"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Neuer _Termin..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Neues _ganztägiges Ereignis"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Neue Besprechung"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Neue Aufgabe"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Drucken..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "E_infügen"
-
-#: 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 "Zum _heutigen Tag"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Gehe zu Datum..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "Ö_ffnen"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "_Speichern unter..."
-
-#: 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 "_Ausschneiden"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopieren"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "Besprechung _ansetzen..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "Als i_Calendar weiterleiten..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Diesen _Treffer löschen"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "_Alle Treffer löschen"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Einstellungen..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5836,32 +5765,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 "Gewählte Objekte werden gelöscht"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Objekte werden aktualisiert"
+
+#: 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 "Ö_ffnen"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: 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 "_Speichern unter..."
+
+#: 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 "_Drucken..."
+
+#: 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 "_Ausschneiden"
+
+#: 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 "_Kopieren"
+
+#: 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 "E_infügen"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: 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 "Gewählte Aufgaben _löschen"
 
-#: 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 "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
 
@@ -5870,39 +5852,102 @@ msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
 msgid "% Complete"
 msgstr "% abgeschlossen"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarme"
-
-#: 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 "Abgeschlossen"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Abschlussdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Fällig am"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Geographische Position"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Priorität"
 
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Anfangsdatum"
+
 # CHECK
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Aufgabensortierung"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "Adresse"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "Neuer _Termin..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Neues _ganztägiges Ereignis"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Neue Besprechung"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Neue Aufgabe"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "_Thread auswählen"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Auswählen..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "In Ordner kopieren..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "In Ordner _verschieben..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "Besprechung _ansetzen..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "Als i_Calendar weiterleiten..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Diesen _Treffer löschen"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "_Alle Treffer löschen"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Zum _heutigen Tag"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Gehe zu Datum..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Einstellungen..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5934,26 +5979,26 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -5962,108 +6007,100 @@ msgstr "PM"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Täglich"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Alle %d Tage"
+msgid_plural "Every %d days"
+msgstr[0] "Täglich"
+msgstr[1] "Täglich"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Wöchentlich"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Alle %d Wochen"
+msgid_plural "Every %d weeks"
+msgstr[0] "Wöchentlich"
+msgstr[1] "Wöchentlich"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Wöchentlich am "
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Alle %d Wochen am "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Wöchentlich am "
+msgstr[1] "Wöchentlich am "
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "monatlich"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "alle %d Monate"
+msgid_plural "every %d months"
+msgstr[0] "monatlich"
+msgstr[1] "monatlich"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Jährlich"
+msgid_plural "Every %d years"
+msgstr[0] "Jährlich"
+msgstr[1] "Jährlich"
 
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Alle %d Jahre"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " insgesamt %d Mal"
+#: 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] " insgesamt %d Mal"
+msgstr[1] " insgesamt %d Mal"
 
 # CHECK
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", endet am "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</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-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: 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 "Eine unbekannte 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."
@@ -6071,318 +6108,322 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Standort:"
+
 #. 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 "Angenommen"
 
-#: 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 "Vorläufig angenommen"
 
-#: 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 "Abgelehnt"
 
-#: 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 "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: 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 "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: 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> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: 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> wünscht die Teilnahme von %s an einer Besprechung."
 
-#: 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> wünscht Ihre Teilnahme an einer Besprechung."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: 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> wünscht zu einer existierenden Besprechung hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: 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> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: 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> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: 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> hat eine Besprechung abgesagt."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Besprechungsabsage"
 
-#: 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> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: 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> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: 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> wünscht, dass %s eine Aufgabe auszuführt."
 
-#: 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> wünscht, dass Sie eine Aufgabe ausführen."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: 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> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: 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> wünscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: 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> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: 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> hat eine Aufgabe abgesagt."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Aufgabenabsage"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: 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> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: 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> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: 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> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: 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 "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: 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 "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\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 ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: 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 "Objekt ist ungültig und konnte nicht aktualisiert werden\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 ""
 "Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
 "Teilnehmer hinzufügen?"
 
-#: 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 ""
 "Teilnahmestatus konnte auf Grund eines ungültigen Status nicht aktualisiert "
 "werden!\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 "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\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 ""
 "Sie haben nicht die erforderlichen Zugriffsrechte, um den Kalender zu "
 "aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: 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 "Eintrag verschickt!\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 "Der Eintrag konnte nicht verschickt werden!\n"
 
@@ -6517,7 +6558,7 @@ msgstr "%a, %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -6599,12 +6640,12 @@ msgstr "Priorität:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: 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"
@@ -6614,7 +6655,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"
@@ -6625,12 +6666,12 @@ msgstr ""
 "%s\n"
 " ist abgestürzt."
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6639,49 +6680,54 @@ msgstr ""
 "Fehler beim Öffnen von %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Aufgaben werden geladen"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Aufgaben werden geladen"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet..."
 
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 "Das Kalender-Backend für\n"
 "%s\n"
 " ist abgestürzt."
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"Das Task-Backend für\n"
+"%s\n"
+" ist abgestürzt."
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -6702,45 +6748,46 @@ msgid "February"
 msgstr "Februar"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Gehe zu Datum"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "März"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: 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 "Oktober"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Den gesamten Text markieren"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Gehe zum heutigen Tag"
+msgid "_Select Today"
+msgstr "Ordner wählen"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6831,7 +6878,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
 #. 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 "Im Web"
 
@@ -6988,81 +7035,81 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %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, %d. %b"
 
-#: 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, %d. %b %Y"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Aufgabe"
 
-#: 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 "Priorität: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: 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 "Druckvorschau"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -7073,38 +7120,38 @@ msgstr ""
 "Die Aufgabenliste »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Aufgabenliste"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: 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 ""
 "Die Aufgabenliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
@@ -8749,7 +8796,7 @@ msgstr "Cache-Pfad konnte nicht angelegt werden"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Cache-Eintrag konnte nicht entfernt werden: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8760,7 +8807,7 @@ msgstr ""
 "Auf diesem Server können keine weiteren Vorgänge wiedergegeben\n"
 "werden, sobald Sie die Netzwerkverbindung erneut herstellen."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8771,7 +8818,7 @@ msgstr ""
 "%s\n"
 "Änderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
@@ -8788,7 +8835,7 @@ msgstr "Neue Nachrichten werden für Offline-Modus abgerufen"
 msgid "Preparing folder '%s' for offline"
 msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Sie müssen online arbeiten, um diesen Vorgang abzuschließen"
 
@@ -8904,30 +8951,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nicht unterstützter Vorgang: Nachricht anhängen: für %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nicht unterstützter Vorgang: Suche nach Ausdruck: für %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterstützter Vorgang: Suche nach UIDs: für %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: 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 "Neue Nachricht(en) wird/werden gefiltert"
 
@@ -8964,7 +9015,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 "Abgesagt."
 
@@ -9367,7 +9419,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Fehlerhafte Legitimationsantwort vom Server."
 
@@ -9567,7 +9619,7 @@ msgstr "Verarbeitungsfehler"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Unterzeichner: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Auf Ordner konnte nicht zugegriffen werden: Ungültiger Vorgang auf diesem "
@@ -9578,22 +9630,23 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner konnte nicht angelegt werden: Ungültiger Vorgang auf diesem Speicher"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Müll"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Unerwünscht"
 
@@ -9827,17 +9880,17 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
@@ -9871,32 +9924,33 @@ msgstr "Filter auf neue Nachrichten im Eingang dieses Servers anwenden"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Entfernte E-Mails automatisch lokal synchronisieren"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "Name des LDAP-Servers:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Adressbuch"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Suchbasis:"
+#: 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
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "Zum Zugriff auf Novell Groupwise-Server"
 
-#: 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 "Passwort"
 
-#: 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."
@@ -9904,8 +9958,8 @@ msgstr ""
 "Dies stellt unter Verwendung eines unverschlüsselten Passworts eine "
 "Verbindung mit dem IMAP-Server her."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Liste"
@@ -9913,12 +9967,12 @@ msgstr "Liste"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server-Verbindung unerwartet getrennt: %s"
@@ -9976,12 +10030,12 @@ msgstr "Der Ordner wurde zerstört und auf dem Serverneu angelegt."
 msgid "Scanning for changed messages"
 msgstr "Nach geänderten Nachrichten suchen"
 
-#: 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 "Nachricht konnte nicht abgerufen werden: %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
@@ -9997,25 +10051,25 @@ msgstr ""
 "Nachricht konnte nicht abgerufen werden: %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 "Nachricht existiert nicht"
 
-#: 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 "Diese Nachricht ist derzeit nicht verfügbar"
 
-#: 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 "Zusammenfassungsinformationen für neue Nachrichten werden abgerufen"
 
-#: 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 "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -10088,18 +10142,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: 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-Dienst für %s auf %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
@@ -10109,14 +10163,14 @@ msgstr "IMAP-Dienst für %s auf %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung mit %s (Port %d) gescheitert: %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 nicht verfügbar"
 
-#: 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
@@ -10124,49 +10178,49 @@ msgstr "SSL nicht verfügbar"
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: 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 "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %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-Erweiterung nicht unterstützt."
 
-#: 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-»Verhandlungen« gescheitert"
 
-#: 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 "Verbindung mit Befehl »%s« konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-Server %s unterstützt den verlangten Legitimationstyp %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10177,32 +10231,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s existiert nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Elternerdner: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -10238,20 +10293,20 @@ msgid "Index message body data"
 msgstr "Rumpfdaten der Nachricht indizieren"
 
 #. $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 "Postfach: %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)"
@@ -10313,7 +10368,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"
@@ -10362,8 +10417,8 @@ msgstr "Ordner-Zusammenfassungsdatei »%s« konnte nicht gelöscht werden: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei »%s« konnte nicht gelöscht werden: %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 "Ordner-Metadatei »%s« konnte nicht gelöscht werden: %s"
@@ -10395,14 +10450,14 @@ msgstr "Ungültiger Inhalt der Nachricht"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Ordner »%s« existiert nicht."
@@ -10421,7 +10476,7 @@ msgstr "»%s« ist kein Maildir-Verzeichnis."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
@@ -10430,28 +10485,28 @@ msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
 msgid "not a maildir directory"
 msgstr "kein Maildir-Verzeichnis"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner »%s« konnte nicht eingelesen werden: %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 "Maildir-Verzeichnispfad konnte nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Konsistenz des Ordners wird überprüft"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Nach neuen Nachrichten sehen"
 
-#: 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
@@ -10499,7 +10554,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erstellen der Nachricht gescheitert: Fehlerhaftes Postfach?"
 
 #: 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 "Es konnte kein Ordner mit diesem Namen angelegt werden."
 
@@ -10529,30 +10584,30 @@ msgstr "»%s« ist keine reguläre Datei."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner »%s« ist nicht leer. Nicht gelöscht."
 
-#: 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 "Verzeichnis »%s« konnte nicht angelegt werden: %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 "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "Der neue Ordnername ist nicht zulässig."
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s konnte nicht in %s umbenannt werden: %s"
@@ -10598,7 +10653,7 @@ msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
@@ -10643,14 +10698,14 @@ msgstr "Anhängen der Nachricht mit MH abgebrochen"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht konnte nicht an mh-Ordner angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Ordner »%s« konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
@@ -10941,46 +10996,46 @@ msgstr ""
 "Sie können in Newsgroups keine Ordner entfernen: Bestellen Sie sie "
 "stattdessen ab."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "Verbindungsfehler: %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 "Ordner existiert nicht: %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 "Gruppe konnte nicht ermittelt werden: %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 "Nachrichten konnten nicht abgerufen werden: unbekannter Fehler"
 
-#: 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-Befehl gescheitert: %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: neue Nachrichten werden eingelesen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Unbekannte Serverrückmeldung: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Abbrechen verwenden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Vorgang gescheitert: %s"
@@ -11027,7 +11082,7 @@ msgstr "Nach %s Tag(en) löschen"
 msgid "Disable support for all POP3 extensions"
 msgstr "Jegliche Unterstützung von POP3-Erweiterungen deaktivieren"
 
-#: 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"
 
@@ -11121,7 +11176,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner »%s« existiert nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11177,12 +11232,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-Mail-Zustellung über das Programm sendmail"
 
-#: 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 ""
 "Zum Zustellen von E-Mails per SMTP über einen entfernten E-Mail-"
 "Knotenpunkt.\n"
@@ -11303,13 +11359,14 @@ msgid "server does not appear to support SSL"
 msgstr "Server scheint kein SSL zu unterstützen"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "Zeitüberschreitung bei STARTTLS-Anfrage: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP-Befehl gescheitert: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "Fehler bei STARTTLS-Antwort"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP-Befehl gescheitert: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11344,157 +11401,159 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP-E-Mail-Auslieferung über %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
 
-#: 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 ""
 "Nachricht konnte nicht verschickt werdenn: mindestens ein Empfänger ungültig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "Zeitüberschreitung bei HELO-Anfrage: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "Fehler bei HELO-Antwort"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: 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 "Zeitüberschreitung bei AUTH-Anfrage: %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-Befehl gescheitert: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH-Anfrage gescheitert."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP-Befehl gescheitert: %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 "Fehlerhafte Legitimationsantwort vom 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 "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "Fehler bei MAIL-FROM-Antwort"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP-Befehl gescheitert: %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 "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: E-Mail nicht verschickt"
 
-#: 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> gescheitert"
 
-#: 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 "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
 
 #. 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 "Fehler bei DATA-Antwort"
-
-#: 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 ""
-"Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenterminierung: %s E-"
-"Mail nicht verschickt"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "Fehler bei DATA-Terminierungsantwort"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP-Befehl gescheitert: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "Fehler bei RSET-Antwort"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "Fehler bei QUIT-Antwort"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP-Befehl gescheitert: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f kB"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f MB"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: 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 "anlage"
 
-#: 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 "Die gewählten Objekte aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
-#: 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 "Datei konnte nicht beigelegt werden: %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 "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
@@ -11516,19 +11575,19 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: 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 "Sie müssen ein Konto einrichten, bevor Sie E-Mails verfassen können."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 
@@ -11539,46 +11598,46 @@ msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 #. * 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 "Antwort an:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Kopie an:"
 
-#: 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 ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Blindkopie an:"
 
-#: 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."
@@ -11589,11 +11648,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Veröffentlichen in:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
@@ -11601,14 +11660,14 @@ msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
-#: 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 ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für Absenderkonto festgelegt"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11616,7 +11675,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für Absenderkonto festgelegt"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11625,30 +11684,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: 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 "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11657,7 +11716,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11666,7 +11725,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %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"
@@ -11675,7 +11734,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11684,7 +11743,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %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?"
@@ -11693,7 +11752,7 @@ msgstr ""
 "gefunden.\n"
 "Soll versucht werden, diese wiederherzustellen?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11705,42 +11764,47 @@ msgstr ""
 "Wollen Sie die Änderungen speichern?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mehrere Nachrichten"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: 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 "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: 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> Datei beigelegt"
 msgstr[1] "<b>%d</b> Dateien beigelegt"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "A_nlagenleiste verbergen (legen Sie Anlagen hier ab)"
 
-#: 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 "A_nlagenleiste anzeigen (legen Sie Anlagen hier ab)"
 
-#: 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 "Eine Nachricht verfassen"
 
-#: 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."
@@ -11748,7 +11812,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Bedienelement »Auswähler« konnte nicht aktiviert werden."
 
-#: 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"
@@ -11760,7 +11824,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\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."
@@ -11768,7 +11832,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11899,7 +11963,7 @@ msgstr ""
 "Wie soll Evolution verfahren, wenn Sie eine E-Mail erhalten, für die eine "
 "Lesebestätigung angefordert wurde?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11907,15 +11971,15 @@ msgstr ""
 "Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "An dieses Passwort erinnern"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort erinnern"
 
@@ -11998,13 +12062,13 @@ msgstr "%k:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%k:%M"
 
@@ -12013,118 +12077,106 @@ msgstr "%k:%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 "Vor 1 Sekunde"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "Vor %d Sekunden"
+msgid_plural "%d seconds ago"
+msgstr[0] "Vor 1 Sekunde"
+msgstr[1] "Vor 1 Sekunde"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "Vor 1 Minute"
+msgid_plural "%d minutes ago"
+msgstr[0] "Vor 1 Minute"
+msgstr[1] "Vor 1 Minute"
 
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "Vor %d Minuten"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "Vor 1 Stunde"
+msgid_plural "%d hours ago"
+msgstr[0] "Vor 1 Stunde"
+msgstr[1] "Vor 1 Stunde"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "Vor %d Stunden"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "Vor 1 Tag"
+msgid_plural "%d days ago"
+msgstr[0] "Vor 1 Tag"
+msgstr[1] "Vor 1 Tag"
 
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "Vor %d Tagen"
-
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "Vor 1 Woche"
+msgid_plural "%d weeks ago"
+msgstr[0] "Vor 1 Woche"
+msgstr[1] "Vor 1 Woche"
 
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "Vor %d Wochen"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "Vor 1 Monat"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "Vor %d Monaten"
+msgid_plural "%d months ago"
+msgstr[0] "Vor 1 Monat"
+msgstr[1] "Vor 1 Monat"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "Vor 1 Jahr"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "Vor %d Jahren"
+msgid_plural "%d years ago"
+msgstr[0] "Vor 1 Jahr"
+msgstr[1] "Vor 1 Jahr"
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Sie müssen ein Datum wählen."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<Klicken Sie hier, um ein Datum zu wählen>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "jetzt"
 
 #. 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.%m.%Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Filterregeln"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Sie müssen einen Dateinamen angeben."
 
-#: 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 "Datei »%s« existiert nicht oder ist keine reguläre Datei"
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Eine Datei wählen"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Dann"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Fällig:</b>"
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben"
 
-#: 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 "Ordner wählen"
 
@@ -12138,23 +12190,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 "Wichtig"
 
 #. 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 "Zu erledigen"
 
 #. 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 "Später"
 
-#: 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"
 
@@ -12162,59 +12214,63 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Der Filter muss benannt werden."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Falls"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Fällig:</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "falls alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "falls irgendein Kriterium zutreffen"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "Ausgang"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Vergleichen mit"
+msgid "    "
+msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Filter bearbeiten"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filterregeln"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "VOrdner bearbeiten"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vOrdner-Quellen"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Vergleichen mit"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Eingang"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Ausgang"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12223,7 +12279,7 @@ msgstr ""
 "des angegebenen Datums verglichen"
 
 # CHECK - time <=> date?!?!
-#: 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."
@@ -12232,7 +12288,7 @@ msgstr ""
 "relativ zu der verglichen, an dem der Filter\n"
 "angewandt wird."
 
-#: 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."
@@ -12240,59 +12296,51 @@ msgstr ""
 "Das Datum der Nachricht wird mit dem Datum\n"
 "verglichen, an dem der Filter angewandt wird."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtuelle Ordner"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "einer zur aktuellen Zeit relativen Zeit"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "in der Vergangenheit"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "Monate"
 
-#: 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 "Sekunden"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "nur bestimmte Ordner"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "der aktuellen Zeit"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "die von Ihnen angegebene Zeit"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vOrdner-Quellen"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "Wochen"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "mit allen aktiven entfernten Ordnern"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "mit allen lokalen und aktiven, entfernten Ordnern"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "mit allen lokalen Ordnern"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "Jahre"
 
@@ -12425,7 +12473,7 @@ msgstr "ist nicht markiert"
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Beschriftung"
@@ -12455,8 +12503,9 @@ msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Nachricht an Bedienoberflächenbefehl weiterleiten"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Das Programm beenden"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12490,23 +12539,24 @@ msgstr "liefert größer als"
 msgid "returns less than"
 msgstr "liefert kleiner als"
 
-#: 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 "Programm ausführen:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Bedienoberflächenbefehl"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Größe (kB)"
@@ -12531,9 +12581,9 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Betreff"
@@ -12542,17 +12592,13 @@ msgstr "Betreff"
 msgid "Unset Status"
 msgstr "Status nicht setzen"
 
-#: 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 "Regelname »%s« ist nicht eindeutig. Wählen Sie einen anderen."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Regeln"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Regel hinzufügen"
 
@@ -12564,8 +12610,9 @@ msgstr "Regel bearbeiten"
 msgid "Rule name"
 msgstr "Regelname "
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Bewertungsregeln"
 
 #: filter/searchtypes.xml.h:1
@@ -12600,15 +12647,20 @@ msgstr "Betreff enthält"
 msgid "Subject does not contain"
 msgstr "Betreff enthält nicht"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuelle Ordner"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Der VOrdner muss benannt werden."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie müssen mindestens einen Ordner als Quelle angeben."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "VOrdner-Quelle"
 
@@ -12661,8 +12713,8 @@ msgstr "Evolution-E-Mail-Ordnerbetrachter"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "E-Mail"
@@ -12671,53 +12723,50 @@ msgstr "E-Mail"
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: 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 "E-Mail-Einstellungen"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Nicht löschen"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Vorgabe]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Kontoname"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: 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 "Namenlose"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Sie müssen einen gültigen Namen für das Skript angeben."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[Skript]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Skript-Signatur hinzufügen"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "Signatur _hinzufügen"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
@@ -12775,7 +12824,7 @@ msgstr ""
 "Der Entwurfsordner für dieses Konto konnte nicht geöffnet werden.\n"
 "Möchten Sie den voreingestellten Entwurfsordner verwenden?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuellen Ordner aus Suche anlegen..."
 
@@ -12805,291 +12854,321 @@ msgstr "Ungelesene Nachrichten"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Eingang"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Ladevorgang..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Ordner %s wird entfernt"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Ordner %s wird geöffnet"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Nachrichten werden nach %s verschoben"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Nachrichten werden nach %s kopiert"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Ordner »%s« wird gespeichert"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ordner konnte nicht gelöscht werden: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Ordner »%s« und alle Unterordner wirklich löschen?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "»%s« löschen"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
 "anderen Namen."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Ansicht"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Verschieben"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Antwort an _Liste"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Antwort an a_lle"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Als u_nerwünscht markieren"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "Lösche_n rückgängig"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzufügen"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Filterregeln"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht anlegen"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Abse_nder"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über _Empfänger"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr "VOrdner über Thread"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr "Filter über Thread"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Vorgabe"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
 #. 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 "Passt auf: %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 "Unsigniert"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13098,12 +13177,12 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: 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 "Gültige Signatur"
 
 # CHECK
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13112,11 +13191,11 @@ msgstr ""
 "Diese Nachricht ist signiert und gültig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: 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 "Ungültige Signatur"
 
-#: 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."
@@ -13124,11 +13203,11 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
 "Möglicherweise wurde sie bei der Übertragung verändert."
 
-#: 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 "Gültige Signatur, Absender konnte nicht verifiziert werden"
 
-#: 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."
@@ -13136,12 +13215,12 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: 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 "Nicht verschlüsselt"
 
 # CHECK
-#: 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."
@@ -13149,12 +13228,12 @@ msgstr ""
 "Diese Nachricht ist nicht verschlüsselt. Daher wurde ihr Inhalt "
 "möglicherweise bei der Übertragung über das Internet ausgespäht."
 
-#: 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 "Schwach verschlüsselt"
 
 # CHECK
-#: 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 "
@@ -13164,11 +13243,11 @@ msgstr ""
 "jedoch schwach. Daher können dritte ihren inhalt zwar nur schwerlich, jedoch "
 "nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: 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 "Verschlüsselt"
 
-#: 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."
@@ -13176,11 +13255,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: 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 "Stark verschlüsselt"
 
-#: 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 "
@@ -13190,32 +13269,32 @@ msgstr ""
 "verschlüsselt. Daher können dritte ihren inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "An _Ort und Stelle anzeigen"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Verbergen"
 
@@ -13224,128 +13303,163 @@ msgstr "_Verbergen"
 msgid "Page %d of %d"
 msgstr "Seite %d von %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 "»%s« wird abgerufen"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf 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 "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf entfernte Daten (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: 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 "Von"
 
-#: 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 "Antwort an"
 
-#: 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 "An"
 
-#: 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 "Kopie"
 
-#: 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 "Blindkopie"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: 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-Anlage"
 
-#: 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 ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: 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 "Interner Fehler: UID-Format ungültig: %s"
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Interner Fehler: UID-Format ungültig: %s"
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spam-Assassin (eingebaut)"
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Jährlich"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Wöchentlich"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "monatlich"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13358,22 +13472,22 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: 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 "POP3-UID-Zwischenspeicher konnten nicht migriert werden: %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 "Ordner-Ausklappstatus konnte nicht migriert werden: %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 "Verzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Öffnen von Speicher für »%s« fehlgeschlagen: %s"
@@ -13412,33 +13526,33 @@ msgstr "Zum Adressbuch _hinzufügen"
 msgid "Open in %s..."
 msgstr "In %s öffnen..."
 
-#: 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 ""
 "Dieser Speicher unterstütz keine Abonnements oder sie sind nicht aktiviert."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: 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 "Ordner"
 
 #. 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 "Bitte wählen Sie einen Server."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13447,25 +13561,25 @@ msgstr ""
 "Fehler beim Laden von Filterinformationen:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. 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 "Am %a, den %d.%m.%Y schrieb %%s um %k:%M Uhr %%+05d:"
 
-#: 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"
@@ -13474,7 +13588,7 @@ msgstr ""
 "In »%s« konnte nicht gespeichert werden:\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13483,35 +13597,35 @@ msgstr ""
 "»%s« existiert bereits.\n"
 "Überschreiben?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "Nachricht"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fehler: »%s« existiert und ist keine reguläre Datei"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Nachricht speichern..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "E-Mail von %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %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 `%"
@@ -13523,7 +13637,7 @@ msgstr ""
 "Falls Sie fortfahren, können Sie diese Nachrichten nicht wiederherstellen.\n"
 "Sollen diese Nachrichten wirklich entfernt werden?"
 
-#: 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"
@@ -13594,51 +13708,61 @@ msgid "Default height of the Message Window"
 msgstr "Vorgabebetreff für die Nachricht."
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Vorgabebetreff für die Nachricht."
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Vorgabebreite des Ordnerleistenfelds"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Vorgabebreite des Ordnerleistenfelds"
 
-#: 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 "Vorgabebreite des Ordnerleistenfelds"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: 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 "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: 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 ""
 "Caret-Modus aktivieren, sodass beim Lesen von E-Mails ein Cursor angezeigt "
 "wird."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Caret-Modus aktivieren/deaktivieren"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
 # CHECK - etwas holprig
-#: 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 "
@@ -13649,15 +13773,19 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: 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 "Liste mit Beschriftungen und den assoziierten Farben"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: 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."
@@ -13666,12 +13794,12 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: 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 ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: 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."
@@ -13681,17 +13809,17 @@ msgstr ""
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: 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 ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentebetrachter hin überprüft "
 "werden sollen"
 
-#: 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 "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: 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 - "
@@ -13700,84 +13828,92 @@ msgstr ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. Zulässige Werte: 0 "
 "(keinesfalls), 1 (falls Absender im Adressbuch), 2 (immer)"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: 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 "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kenzeichnen"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kenzeichnen."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: 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 "Klangdatei zur Benachrichtigung bei neuen E-Mails"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Benachrichtigungstyp bei neuen E-Mails"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: 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 "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: 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 ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: 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."
@@ -13785,97 +13921,109 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: 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 "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
 
-#: 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 ""
 "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
 "verschicken"
 
-#: 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 "Links im Text erkennen und ersetzen."
 
-#: 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 "Smileys im Text erkennen und durch Bilder ersetzen."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "G3h31m-0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "G3h31m-0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: 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 ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: 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 "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
-#: 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 "Beim Eintreffen neuer E-Mails wiederzugebende Klangdatei."
 
-#: 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 ""
 "Legt den Typ der Benachrichtigung bei neuen E-Mails fest, den der Benutzer "
 "verwenden möchte."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: 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 "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift"
 
-#: 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 "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite"
 
 # CHECK
-#: 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;"
@@ -13887,100 +14035,100 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: 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 "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: 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-Zeichenkette für das Vorgabekonto."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Spamassassin-Daemon und -Client verwenden"
 
-#: 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 "Spamassassin-Daemon und -Client verwenden (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
 
-#: 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 "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "Ansicht/Von-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "Ansicht/Von-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: 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."
@@ -13988,11 +14136,11 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: 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 zum Ausführen des vom Benutzer ausgeführten spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "spamd-Port"
 
@@ -14031,14 +14179,14 @@ msgstr "Evolution importiert Ihre alte 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 "Importieren..."
 
 #: 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 "Bitte warten"
 
@@ -14087,12 +14235,12 @@ msgstr "Dateien werden importiert"
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritätsfilter »%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"
@@ -14121,7 +14269,7 @@ msgstr ""
 "Überprüfen Sie die importierten Filter, um sicherzustellen,\n"
 "dass alles erwartungsgemäß funktioniert."
 
-#: 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"
@@ -14134,7 +14282,7 @@ msgstr ""
 "unterstützt.\n"
 "Diese Filter gehen verloren."
 
-#: 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"
@@ -14149,24 +14297,24 @@ msgstr ""
 "sie nun prüfen, ob diese Zeichenfolge im\n"
 "Nachrichtenrumpf enthalten ist oder nicht."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "E-Mail-Filter"
 
-#: 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?"
@@ -14199,63 +14347,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Aktuelles Speicherformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Rumpfinhalt indizieren"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Neues Speicherformat:"
-
-#: 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 ""
-"Hinweis: Beim Konvertieren zwischen Postfach-Formaten\n"
-"kann ein Fehler (wie z.B. fehlender Plattenplatz)\n"
-"eventuell nicht automatisch behoben werden. Bitte\n"
-"verwenden Sie diese Funktion mit Vorsicht."
-
-#: 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 "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 
 #. 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-Konteneditor"
 
-#: 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 "_Rechner:"
 
-#: 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 "_Benutzername:"
 
-#: 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 "_Pfad:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit dem selben Namen anlegen."
 
@@ -14288,11 +14401,11 @@ msgstr "Antwort auf %s"
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Folgende Filterregel(n):\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14303,46 +14416,46 @@ msgstr ""
 "    »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Neuer VOrdner"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-Mail-Filter"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Einen neuen Kalender anlegen"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr "URI der E-Mail-Quelle, die diese Ansicht anzeigt"
 
-#: 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 "Identität"
 
-#: 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 "
@@ -14353,11 +14466,12 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: 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 "Abrufen von E-Mails"
 
-#: 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."
@@ -14366,15 +14480,15 @@ msgstr ""
 "Falls Sie nicht sich sicher sind, wenden Sie sich bitte an Ihren "
 "Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: 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."
@@ -14383,11 +14497,11 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-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 "Kontenverwaltung"
 
-#: 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 "
@@ -14403,128 +14517,261 @@ msgstr ""
 "Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: 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 "Verbindung mit Server wird hergestellt..."
 
-#: 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 "_Prüfen, welche Typen unterstützt werden "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Vorschau"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL wird von diesem Evolution-Build nicht unterstützt)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL wird von diesem Evolution-Build nicht unterstützt)"
+#, 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>"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Nach neuen E-Mails sehen"
+
+#: mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:14
+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>_Angezeigte E-Mail-Kopfzeilen</b>"
 
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+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 "E-Mail-Benachrichtigung"
+
+#: 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 "Nachrichten in »Verschickt« und »Entwürfe«"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
 # CHECK
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:33
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor dem Benutzer selbst "
 "verschlüsseln"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Kontoinformationen"
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Signatur hinzufügen..."
 
-#: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
 msgstr "Sk_ript hinzufügen"
 
-#: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Signatur hinzufügen..."
-
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:38
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "_Kopie immer schicken an:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Blindkopie immer schicken an:"
 
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "_Kopie immer schicken an:"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Beim Verwenden dieses Kontos ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Originalnachricht anhängen"
 
-#: 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 "Anlage"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Legitimation"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "Smiley-Bilder _automatisch einfügen"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Automatisch nach neuen E-Mails sehen alle"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "Beim Eintreffen neuer E-Mails _Piepston ausgeben"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Farben"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "_Prüfen, welche Typen unterstützt werden "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "_Eingehende E-Mails überprüfen"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr ""
 "Die Rechtschreibprüfung _unmittelbar beim Eingeben der Zeichen durchführen"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Nach neuen E-Mails sehen"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Überprüft, ob eingehende Nachrichten unerwünscht sind"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falsch geschriebene Wörter:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Nachrichten verfassen"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Farben"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Konfiguration"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Beim Säubern eines Ordners _rückfragen"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14542,135 +14789,114 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Vorgabeverhalten"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Voreingestellte Zeichen_kodierung:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "E-Mail wird gelöscht"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: 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 "Fertig"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: 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 "Müllordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Verschlüsselungszertifikat:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Befehl ausführen..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "_Dicktengleich:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Filtereinstellungen"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML-E-Mail"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "_Kopfzeilen"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: 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 "An Ort und Stelle"
 
-#: 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 "Beschriftungen und Farben"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Bilder werden geladen"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Nachrichteneditor"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Nachrichtenanzeige"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Nachrichtenschrift"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "E-Mail-Benachrichtigung"
-
-#: 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"
@@ -14678,141 +14904,150 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Optionale Informationen"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "Beim Eintreffen neuer E-Mails _Klangdatei abspielen"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: 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 "Druckschriftarten"
-
-#: 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 "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Dieses Passwort _speichern"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "An Passwort erinnern"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Dieses _Passwort speichern"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Benötigte Informationen"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Vorgaben wiederherstellen"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "An Passwort erinnern"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "Sich_erheit"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Standard-Schrift:"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Sichere MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Sicherheit"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "HTML-Proprtionalschrift wählen"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_Auswählen..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Nachrichten in »Verschickt« und »Entwürfe«"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Server-Konfiguration"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Server-_Typ: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "_Signaturzertifikat:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Signatur:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Signaturen"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "_Rechtschreibprüfung"
 
-#: 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-Schrift:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Typ:"
+
+#: 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"
@@ -14822,7 +15057,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zu Anzeigezwecken verwendet."
 
-#: 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 "
@@ -14832,7 +15067,7 @@ msgstr ""
 "konfigurieren. Diese Sprachliste enthält ausschließlich die Sprachen, für "
 "die ein Wörterbuch installiert sind."
 
-#: 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\""
@@ -14840,15 +15075,15 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Arbeit« oder »Persönlich«."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "_Daemon verwenden"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14858,178 +15093,111 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Weiter«, um zu beginnen."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: 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 "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Beim Verwenden dieses Kontos ausgehende Nachrichten _immer signieren"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "L_egitimationstyp: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Legitimationstyp: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "_Automatisch nach neuen E-Mails sehen alle"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "Smiley-Bilder _automatisch einfügen"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "Beim Eintreffen neuer E-Mails _Piepston ausgeben"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "Beim Säubern eines Ordners _rückfragen"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Vorgabesignatur:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Vorgaben"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Beim Eintreffen neuer E-Mails nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlüsseln (per Vorgabe)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Voller Name:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML-E-Mail"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identität"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Unerwünscht"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "Bilder _laden, falls der Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "Ausschließlich _lokale Tests"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: 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 "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "Beim Eintreffen neuer E-Mails _Klangdatei abspielen"
-
-#: 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 ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Abrufen von E-Mails"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "Auf Vorgaben _zurücksetzen"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Auswählen..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Verschicken von E-Mails"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Signaturen"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Standard-Schrift:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminal-Schrift:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "Minute(n)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "Farbe"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15039,7 +15207,7 @@ msgstr ""
 "  %s:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15048,7 +15216,7 @@ msgstr ""
 "Fehler bei folgendem Vorgang:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbeitet"
 
@@ -15056,16 +15224,16 @@ msgstr "Arbeitet"
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15074,116 +15242,115 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "»%s« wird verschickt"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "%d Nachricht(en) wird/werden abgerufen"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d Nachricht(en) wird/werden abgerufen"
+msgstr[1] "%d Nachricht(en) wird/werden abgerufen"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "%d Nachricht(en) wird/werden gespeichert"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "%d Nachricht(en) wird/werden gespeichert"
+msgstr[1] "%d Nachricht(en) wird/werden gespeichert"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15192,7 +15359,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15201,11 +15368,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15214,25 +15381,21 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr "Unerwünscht-Status wird verändert"
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung berücksichtigen"
@@ -15245,84 +15408,80 @@ msgstr "In Nachricht suchen"
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Suchen"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Digitale Signatur"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Verschlüsselung"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Absagevorgang..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "E-Mails abrufen und verschicken"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: 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 "Warten..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Signaturdatei konnte nicht gespeichert werden: %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"
@@ -15333,23 +15492,23 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "Änderungen verwerfen"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Signatur bearbeiten"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Geben Sie einen Namen für diese Signatur ein."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Name:"
 
@@ -15379,17 +15538,17 @@ msgstr "Weitergeleitete Nachricht"
 msgid "Invalid folder: `%s'"
 msgstr "Ungültiger Ordner: »%s«"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "vOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15402,85 +15561,85 @@ msgstr ""
 "   »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner »%s« zu bearbeiten, der nicht existiert."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: 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 "Heute %I:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
@@ -15528,7 +15687,7 @@ msgstr "Folgenachricht"
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -15537,11 +15696,11 @@ msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
 # CHECK
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Antwort verfassen"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
@@ -15568,7 +15727,8 @@ msgstr ""
 "»Markierung«."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Fällig am:"
 
 #: mail/message-tags.glade.h:7
@@ -15782,7 +15942,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Die Besprechung für diesen Eintrag absagen"
 
-#: 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 "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
@@ -15812,26 +15972,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Wählen Sie einen Importeur"
 
-#: 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 "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importieren"
 
-#: 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 "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15840,31 +16000,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Dateiname:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: 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"
@@ -15872,26 +16032,26 @@ msgstr ""
 "Bitte warten...\n"
 "Nach existierenden Einstellungen wird gesucht"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: 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 "Von %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Kein Treiber für Protokoll »%s« verfügbar"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg konnte nicht ausgeführt werden."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importieren"
 
@@ -15899,7 +16059,7 @@ msgstr "_Importieren"
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution-Einstellungen "
 
@@ -15933,11 +16093,11 @@ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: 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 "
@@ -15951,10 +16111,6 @@ msgstr ""
 "\n"
 "Soll der Assistent jetzt beendet werden?"
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "Assistenten beenden"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kein Ordnername angegeben."
@@ -15998,15 +16154,15 @@ msgstr "Bug-Buddy konnte nicht gestartet werden."
 msgid "About Ximian Evolution"
 msgstr "Info zu Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -16062,7 +16218,6 @@ msgstr "Kontrollkästchen"
 
 #: 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 "Neu"
 
@@ -16116,18 +16271,19 @@ msgid "Create a new test item"
 msgstr "Ein neues Testobjekt anlegen"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Aktive Verbindungen"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktive Verbindungen"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "Ka_lender:"
@@ -16251,28 +16407,28 @@ msgstr ""
 "Dieser Assistent führt Sie durch das Importieren externer\n"
 "Dateien in Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importeure"
 
-#: 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 "Importieren"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Nicht importieren"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Mich nicht mehr fragen"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
 #. 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"
@@ -16315,7 +16471,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unsrer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16323,50 +16479,50 @@ msgstr ""
 "Vielen Dank\n"
 "Das Ximian Evolution-Team\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Auf die Ximian-Evolution-Bedienoberfläche konnte nicht zugegriffen werden."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 "Die Ximian-Evolution-Bedienoberfläche konnte nicht initialisiert werden: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: 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"
@@ -16375,43 +16531,54 @@ msgstr ""
 "%s: --online und --offline können nicht gemeinsam übergeben werden.\n"
 " Verwenden Sie %s --help, um weitere Informationen zu erhalten.\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 "Wählen Sie ein zu importierendes Zertifikat..."
 
-#: 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 "Zertifikatname"
 
-#: 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 "Verwendungszwecke"
 
-#: 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 "Seriennummer"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Läuft aus"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Zertifikatbetrachter: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Geben Sie das Passwort für »%s« ein"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Geben Sie das Passwort für %s ein"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Passwort eingeben"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16608,7 +16775,8 @@ msgstr "Sie haben Zertifikate, die folgende Personen identifizieren:"
 msgid "Your Certificates"
 msgstr "Ihre Zertifikate"
 
-#: 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 "Zertifikat existiert bereits"
 
@@ -16881,7 +17049,7 @@ msgstr "Kontakt(e) in einen anderen Ordner verschieben..."
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: 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 "Den Inhalt der Zwischenablage einfügen"
 
@@ -16890,8 +17058,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
@@ -16939,13 +17107,13 @@ msgstr "Laden stoppen"
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "A_ktionen"
 
@@ -16966,14 +17134,10 @@ msgid "_Save as VCard"
 msgstr "Als VCard _speichern"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "Nach Kontakten _suchen"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "A_lle auswählen"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken..."
 
@@ -16981,58 +17145,54 @@ msgstr "_Nachricht an Kontakt schicken..."
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Alle Treffer löschen"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Den Termin löschen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Diesen Treffer löschen"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer löschen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Zurück gehen"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Vor gehen"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Gehe zu _Datum"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Gehe zu einem bestimmten Datum"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Gehe zum heutigen Tag"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Weiter"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Vorherige"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
@@ -17041,7 +17201,7 @@ msgstr "Diesen Kalender drucken"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
-#: 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 "_Säubern"
 
@@ -17050,34 +17210,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen löschen"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Den gesamten Text markieren"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Gehe zu einem bestimmten Datum"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Ordner wählen"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Einen Tag anzeigen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Einen Monat anzeigen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Eine Woche anzeigen"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Die Arbeitswoche anzeigen"
 
-#: 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 "Heute"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
@@ -17343,7 +17523,7 @@ msgstr "Alle als _gelesen markieren"
 msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Die in der Zwischenablage befindliche(n) Nachricht(en) einfügen"
 
@@ -17511,308 +17691,310 @@ msgid "F_orward As..."
 msgstr "W_eiterleiten als..."
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Filterregeln"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Die gewählte(n) Nachricht(en) als unerwünscht markieren"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Die gewählte(n) Nachricht(en) als Folgenachricht(en) markieren"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_Folgenachricht..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Die gewählte(n) Nachricht(en) als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Die gewählte(n) Nachricht(en) als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Die gewählte(n) Nachricht(en) als unerwünscht markieren"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Die gewählte(n) Nachricht(en) als nicht unerwünscht markieren"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Die gewählte(n) Nachricht(en) als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Die gewählte(n) Nachricht(en) als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten als zu löschend markieren"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Die gewählte(n) Nachricht(en) in einen anderen Ordner verschieben"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Weiter"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Erwünscht"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Die gewählte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die gewählte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
 "verschicken"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Original_größe"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Eine _Antwort veröffentlichen"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Vorherige"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker festlegen"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quelltext anzeigen"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil anzeigen"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Te_xtgröße"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Beigelegt"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Filter aus Nachricht erzeugen"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Größer"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Normal anzeigen"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "Nachricht ö_ffnen"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "E_rneut verschicken..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "Löschen _rückgängig"
 
@@ -18079,39 +18261,39 @@ msgstr "Die gewählte Aufgabe kopieren"
 msgid "Cut selected task"
 msgstr "Die gewählte Aufgabe ausschneiden"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben löschen"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Die gewählten Aufgaben löschen"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Als abgeschlossen mar_kieren"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Die gewählten Aufgaben als abgeschlossen markieren"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Aufgabe aus der Zwischenablage einfügen"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Eine Vorschau auf die zu druckende Aufgabenliste anzeigen"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Die gewählte Aufgabe anzeigen"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "Aufgabe ö_ffnen"
 
@@ -18242,10 +18424,15 @@ msgid "_Day View"
 msgstr "_Tagesansicht"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Listenansicht"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Monatsansicht"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Arbeitswochenansicht"
 
@@ -18274,10 +18461,16 @@ msgid "_Messages"
 msgstr "_Nachrichten"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Mit _Kategorie"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Fällig am:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Status setzen:"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
@@ -18336,14 +18529,10 @@ msgstr "MDMDFSS"
 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 "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Heute"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18353,83 +18542,88 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Griechisch"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: 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 "Westeuropäisch"
 
-#: 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 "Westeuropäisch"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: 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 "Vereinfacht"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 # CHECK
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Visuell"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %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 "Zeichenkodierung"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Weitere..."
 
@@ -18496,11 +18690,16 @@ msgid "Spacing around expander arrow"
 msgstr "Polsterung um Aufklapppfeil"
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Suchen"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Sucheditor"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Suche speichren"
 
@@ -18521,15 +18720,15 @@ msgstr "_Komplex..."
 msgid "Choose Image"
 msgstr "Eine Datei wählen"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Suchen"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: 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 "_Löschen"
 
@@ -18559,6 +18758,332 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Adressbuchquellen..."
+
+#~ msgid "Selected:"
+#~ msgstr "Gewählt:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 Kontakt"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "und %d weitere Karten."
+
+#~ msgid "Send an Email"
+#~ msgstr "Eine E-Mail verschicken"
+
+#~ msgid "1 day"
+#~ msgstr "1 Tag"
+
+#~ msgid "1 week"
+#~ msgstr "1 Woche"
+
+#~ msgid "1 hour"
+#~ msgstr "1 Stunden"
+
+#~ msgid "1 minute"
+#~ msgstr "1 Minute"
+
+#~ msgid "1 second"
+#~ msgstr "1 Sekunde"
+
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
+#~ msgid "component"
+#~ msgstr "Komponente"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarme"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Geographische Position"
+
+#~ msgid "URL"
+#~ msgstr "Adresse"
+
+#~ msgid "Every %d days"
+#~ msgstr "Alle %d Tage"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Alle %d Wochen"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Alle %d Wochen am "
+
+#~ msgid "every %d months"
+#~ msgstr "alle %d Monate"
+
+#~ msgid "Every %d years"
+#~ msgstr "Alle %d Jahre"
+
+#~ msgid "Go To Date"
+#~ msgstr "Gehe zu Datum"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Gehe zum heutigen Tag"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Name des LDAP-Servers:"
+
+#~ msgid "Search base:"
+#~ msgstr "Suchbasis:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "Zeitüberschreitung bei STARTTLS-Anfrage: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "Fehler bei STARTTLS-Antwort"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "Zeitüberschreitung bei HELO-Anfrage: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "Fehler bei HELO-Antwort"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH-Anfrage gescheitert."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Fehler bei MAIL-FROM-Antwort"
+
+#~ msgid "DATA response error"
+#~ msgstr "Fehler bei DATA-Antwort"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenterminierung: %s "
+#~ "E-Mail nicht verschickt"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "Fehler bei DATA-Terminierungsantwort"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "Fehler bei RSET-Antwort"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "Fehler bei QUIT-Antwort"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "Vor %d Sekunden"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "Vor %d Minuten"
+
+#~ msgid "%d hours ago"
+#~ msgstr "Vor %d Stunden"
+
+#~ msgid "%d days ago"
+#~ msgstr "Vor %d Tagen"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "Vor %d Wochen"
+
+#~ msgid "%d months ago"
+#~ msgstr "Vor %d Monaten"
+
+#~ msgid "%d years ago"
+#~ msgstr "Vor %d Jahren"
+
+#~ msgid "Then"
+#~ msgstr "Dann"
+
+#~ msgid "If"
+#~ msgstr "Falls"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Filter bearbeiten"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "VOrdner bearbeiten"
+
+#~ msgid "Outgoing"
+#~ msgstr "Ausgang"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Nachricht an Bedienoberflächenbefehl weiterleiten"
+
+#~ msgid "Shell Command"
+#~ msgstr "Bedienoberflächenbefehl"
+
+#~ msgid "Rules"
+#~ msgstr "Regeln"
+
+#~ msgid "[script]"
+#~ msgstr "[Skript]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Skript-Signatur hinzufügen"
+
+#~ msgid "Current store format:"
+#~ msgstr "Aktuelles Speicherformat:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Rumpfinhalt indizieren"
+
+#~ msgid "New store format:"
+#~ msgstr "Neues Speicherformat:"
+
+#~ 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 ""
+#~ "Hinweis: Beim Konvertieren zwischen Postfach-Formaten\n"
+#~ "kann ein Fehler (wie z.B. fehlender Plattenplatz)\n"
+#~ "eventuell nicht automatisch behoben werden. Bitte\n"
+#~ "verwenden Sie diese Funktion mit Vorsicht."
+
+#~ msgid "maildir"
+#~ msgstr "Maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL wird von diesem Evolution-Build nicht unterstützt)"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontoinformationen"
+
+#~ msgid "Authentication"
+#~ msgstr "Legitimation"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Nachrichten verfassen"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Vorgabeverhalten"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "E-Mail wird gelöscht"
+
+#~ msgid "Filter Options"
+#~ msgstr "Filtereinstellungen"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Beschriftungen und Farben"
+
+#~ msgid "Loading Images"
+#~ msgstr "Bilder werden geladen"
+
+#~ msgid "Message Display"
+#~ msgstr "Nachrichtenanzeige"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Nachrichtenschrift"
+
+#~ msgid "Optional Information"
+#~ msgstr "Optionale Informationen"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Druckschriftarten"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Dieses Passwort _speichern"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Dieses _Passwort speichern"
+
+#~ msgid "Required Information"
+#~ msgstr "Benötigte Informationen"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Vorgaben wiederherstellen"
+
+#~ msgid "S_ecurity"
+#~ msgstr "Sich_erheit"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Sichere MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Server-Konfiguration"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "L_egitimationstyp: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Legitimationstyp: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Vorgabesignatur:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Voller Name:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identität"
+
+#~ msgid "_Junk"
+#~ msgstr "_Unerwünscht"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Abrufen von E-Mails"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "Auf Vorgaben _zurücksetzen"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Verschicken von E-Mails"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "»%s« wird verschickt"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Fehlgeschlagen bei Nachricht %d von %d"
+
+#~ msgid "Changing junk status"
+#~ msgstr "Unerwünscht-Status wird verändert"
+
+#~ msgid "Search"
+#~ msgstr "Suchen"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Digitale Signatur"
+
+#~ msgid "Encryption"
+#~ msgstr "Verschlüsselung"
+
+#~ msgid "Quit Assistant"
+#~ msgstr "Assistenten beenden"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "Nach Kontakten _suchen"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Gehe zu _Datum"
+
+#~ msgid "Go to today"
+#~ msgstr "Gehe zum heutigen Tag"
+
+#~ msgid "With _Category"
+#~ msgstr "Mit _Kategorie"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Adressbuchquellen"
 
@@ -18613,9 +19138,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Scanning directory"
 #~ msgstr "Verzeichnis wird eingelesen"
 
-#~ msgid "    "
-#~ msgstr "    "
-
 #~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
 #~ msgstr "Eingehende E-Mails bei IMAP-Konten _nicht überprüfen"
 
diff --git a/po/el.po b/po/el.po
index 9ffcdd8b96..3d5cf974d0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -34,17 +34,58 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-18 00:24+0200\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-18 00:26+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\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"
 "X-Generator: KBabel 1.0.2\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"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Λίστα τοπικών φακέλων βιβλίου διευθύνσεων"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Αποθήκευση Ως"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "κάρτες"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "κάρτες"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Επαφές: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Συναγερμός Evolution "
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Προεπιλεγμένη διεύθυνση συγχρονισμού:"
@@ -57,7 +98,8 @@ msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήρι
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
 msgid "Could not read pilot's Address application block"
-msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -120,77 +162,94 @@ msgstr "Διαχείριση των πιστοποιητικών  S/Mime εδώ"
 #: addressbook/gui/component/addressbook-component.c:225
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: 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 "Νέο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Νέα Επαφή"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Επαφή"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Δημιουργία νέας επαφής"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Νέα Λίστα Επαφών"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Λίστα Επαφών"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Δημιουργία νέας λίστας επαφών"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Νέο Βιβλίο Διευθύνσεων"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Βιβλίο Διευθύνσεων"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Δημιουργία νέας εργασίας"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Αδύνατη η δημιουργία ερωτήματος στο 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 "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Η απάντηση του διακομιστή δεν περιείχε έγκυρο σχήμα πληροφοριών"
 
@@ -219,7 +278,7 @@ msgstr "Εισαγωγή  `%s':"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: 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"
@@ -227,9 +286,9 @@ msgstr "Σε αυτό τον υπολογιστή"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Προσωπικό"
 
@@ -288,7 +347,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -296,7 +355,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν η "
 "διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -304,7 +363,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Αυτό σημαίνει ότι έχετε "
 "εισαγάγει  λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι εκτός λειτουργίας."
 
-#: 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 "
@@ -314,7 +373,7 @@ msgstr ""
 "κάνετε χρήση LDAP  στο Evolution θα πρέπει να συνθέσετε το πρόγραμμα από τις "
 "πηγές CVS αφού κάνετελήψη του OpenLDAP από τον παρακάτω σύνδεσμο."
 
-#: 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."
@@ -322,28 +381,28 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων. Αυτό σημαίνει ότι έχετε "
 "εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής είναι εκτός λειτουργίας."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %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 της πηγής επαφών που θα εμφανίσει η προβολή"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "Το URI που θα εμφανίσει το βιβλίο διευθύνσεων"
 
@@ -370,16 +429,10 @@ msgstr ""
 "ονομάτων"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -394,59 +447,51 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "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 "Βοηθός δημιουργίας Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Ιδιότητες Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Πηγές βιβλίου διευθύνσεων"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Πάντοτε"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Ανώνυμα"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -459,53 +504,54 @@ msgstr ""
 "Πατήστε το πλήκτρο \"Εφαρμογή\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε "
 "εισάγει εδώ."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Σύνδεση"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Διακεκριμένο ό_νομα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Διεύθυνση Email:"
 
-#: 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 θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στο "
 "διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:20
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας στο "
 "διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Ολοκληρώθηκε"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Γενικά"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Ομάδα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Ποτέ"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -522,23 +568,19 @@ msgstr ""
 "συστήματος αν αυτός ο διακομιστής\n"
 "χρησιμοποιεί αυτά τα πρωτόκολλα."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Ένα"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Βάθος ανα_ζήτησης: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Γίνεται αναζήτηση"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Επιλεγμένα:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -548,7 +590,7 @@ msgstr ""
 "διακομιστή LDAP\n"
 "μόνο αν ο διακομιστής υποστηρίζει SSL ή 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"
@@ -566,7 +608,7 @@ msgstr ""
 "σύνδεση σας είναι ήδη\n"
 "ασφαλής."
 
-#: 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"
@@ -580,7 +622,7 @@ msgstr ""
 "τρύπες \n"
 "ασφαλείας."
 
-#: 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 "
@@ -591,7 +633,7 @@ msgstr ""
 "Evolution για\n"
 "αναζητήσεις LDAP και την δημιουργία και επεξεργασία επαφών."
 
-#: 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"
@@ -601,32 +643,32 @@ msgstr ""
 "\t\t\t  ονόματος εμφάνισης είναι το πρώτο απαιτούμενο βήμα στη\n"
 " \t\t\t  ρύθμιση ενός βιβλίου διευθύνσεων."
 
-#: 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 "Βήμα 1: Χαρακτηριστικά φακέλου"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Βήμα 2: Πληροφορίες διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Βήμα 3: Σύνδεση στο διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Βήμα 4: Αναζήτηση στο κατάλογο"
 
-#: 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 "Υποστηριζόμενες βάσεις αναζήτησης"
 
-#: 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"
@@ -640,7 +682,7 @@ msgstr ""
 "διαχειριστή του συστήματος σας\n"
 "αν θέλετε να αλλάξετε αυτές τις επιλογές."
 
-#: 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"
@@ -652,7 +694,7 @@ msgstr ""
 "αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
 "κατάλογο του δέντρου. "
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -668,7 +710,7 @@ msgstr ""
 "Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
 "βρίσκονται μόνο ένα επίπεδο κάτω.\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"
@@ -685,7 +727,7 @@ msgstr ""
 "του\n"
 "συστήματος σας αν θέλετε βοήθεια για να βρείτε αυτές τις πληροφορίες."
 
-#: 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"
 "\"."
@@ -693,7 +735,7 @@ msgstr ""
 "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"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"
@@ -703,7 +745,7 @@ msgstr ""
 "μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
-#: 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 "
@@ -713,7 +755,7 @@ msgstr ""
 "σας.Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη πρόσβαση "
 "στο διακομιστή ldap."
 
-#: 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"
@@ -723,7 +765,7 @@ msgstr ""
 "του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
-#: 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 "
@@ -732,7 +774,7 @@ msgstr ""
 "Αυτό είναι το όνομα που  θα εμφανιστεί στη λίστα φακέλων του Evolution. "
 "Είναι μόνο για λόγους εμφάνισης."
 
-#: 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"
@@ -745,28 +787,29 @@ msgstr ""
 "συστήματος σας\n"
 "για το ποιά θύρα θα χρησιμοποιήσετε."
 
-#: 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 "Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
+msgstr ""
+"Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "_Χρήση SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Χρήση διακεκριμένου ονόματος (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατό"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -778,60 +821,48 @@ msgstr ""
 "πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες "
 "πληροφορίες αν δεν είστε σίγουροι."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Όνομα εμφάνισης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_Επεξεργασία"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "Μέθοδος _πιστοποίησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "Αριθμός _Θύρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Βάση  _αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Όνομα _διακομιστή:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Χρόνος λήξης (λεπτά):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "κάρτες"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "στήλη-σύνδεσης"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "στήλη-γενικών"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "στήλη-αναζήτησης"
 
@@ -863,7 +894,7 @@ msgid "Send HTML Mail?"
 msgstr "Να αποσταλεί το μήνυμα HTML;"
 
 #: 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 "Προσθήκη στις Επαφές"
 
@@ -879,7 +910,7 @@ msgstr "Όνομα"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Πηγή"
 
@@ -946,7 +977,8 @@ msgstr "Συνεργασία"
 
 #. 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 "Επεξεργαστής Επαφών"
 
@@ -955,7 +987,7 @@ msgid "D_epartment:"
 msgstr "Τ_μήμα:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Λεπτομέρειες"
@@ -1040,16 +1072,27 @@ msgstr "_Κατηγορίες..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-calendar-view.c:1267
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2444
-#: mail/em-folder-view.c:765 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 "_Διαγραφή"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Επεξεργασία"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "Οι_κία:"
@@ -1092,16 +1135,16 @@ msgstr "_Διεύθυνση Ιστοσελίδας:"
 
 #: 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 "Διεύθυνση:"
 
 #: 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
@@ -2087,7 +2130,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"
@@ -2102,20 +2145,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 "Υπηρεσία"
 
 #: 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 "Τοποθεσία"
 
@@ -2124,111 +2168,95 @@ msgid "Username"
 msgstr "Όνομα Χρήστη:"
 
 #: 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 "Οικία"
 
 #. 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 "Εργασία"
 
 #: 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 "Άλλα"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Πηγαίο βιβλίο"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Βιβλίο στόχου"
 
-#: 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:180
 msgid "Contact"
 msgstr "Επαφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Είναι νέα επαφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Εγγράψιμα Πεδία"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Αλλάχθηκε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Όνομα Λογαριασμού"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Ο επεξεργαστής κατηγορίας δεν είναι διαθέσιμος."
 
-#: 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 "Αυτή η επαφή ανήκει στις κατηγορίες:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Αποθήκευση Επαφής ως VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφούν αυτές οι επαφές?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφεί η επαφή;"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Εργασία"
 
-#: 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 "Novell 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 "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
@@ -2242,6 +2270,7 @@ msgid "_Edit Full"
 msgstr "Πλή_ρης Επεξεργασία"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "Π_λήρες Όνομα:"
 
@@ -2249,6 +2278,22 @@ msgstr "Π_λήρες Όνομα:"
 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 ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφεί η επαφή;"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Διεύθυνση _2:"
@@ -2369,6 +2414,10 @@ msgstr "Υπηρεσία IM:"
 msgid "_Location:"
 msgstr "Τοποθεσία:"
 
+#: 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 "Μέλη"
@@ -2383,31 +2432,33 @@ msgstr "Λίστα _ονόματος:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr ""
+"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
 msgstr "επεξεργαστής-λίστας-επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "Βιβλίο"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "Είναι Νέα Λίστα"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr "Επεξεργαστής Λίστας Επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "Αποθήκευση Λίστας ως Vcard"
 
@@ -2459,23 +2510,21 @@ msgid "No contacts"
 msgstr "Όχι επαφές"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 Επαφή"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d επαφές"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d επαφές"
+msgstr[1] "%d επαφές"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "Ερώτημα"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Σφάλμα λήψης όψης βιβλίου"
 
@@ -2487,127 +2536,128 @@ msgstr "Μοντέλο"
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Όνομα αρχίζει με"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Η κατηγορία είναι"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "Για Προχωρημένους..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Τύπος"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Αποθήκευση ως (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Νέα Επαφή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Νέα Λίστα Επαφών..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Μετάβαση στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Εισαγωγή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Αναζήτηση για επαφές..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Πηγές βιβλίου διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Ρυθμίσεις Pilot ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Προώθηση Επαφής"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "Εκτύπωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Εκτύπωση Φακέλου"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Αντιγραφή στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Μετακίνηση στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:372 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1236
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2620,7 +2670,7 @@ msgstr ""
 "ξαναχρησιμοποιήσετε"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
@@ -2654,8 +2704,6 @@ msgid "Car Phone"
 msgstr "Τηλέφωνο Αυτοκινήτου"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -2664,7 +2712,7 @@ msgid "Company Phone"
 msgstr "Τηλέφωνο Εταιρείας"
 
 #: 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"
 
@@ -2715,6 +2763,7 @@ msgid "Manager"
 msgstr "Διευθυντής"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Κινητό Τηλέφωνο"
 
@@ -2723,7 +2772,7 @@ msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
 #: 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 "Σημείωση"
 
@@ -2869,7 +2918,7 @@ msgid "map"
 msgstr "χάρτης"
 
 #: 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 "Μέλη λίστας"
 
@@ -2891,6 +2940,7 @@ msgid "Video Conferencing"
 msgstr "Τηλεδιάσκεψη"
 
 #: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
@@ -2907,27 +2957,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 "προσωπικό"
 
-#: addressbook/gui/widgets/eab-contact-display.c:516
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Τίτλος εργασίας:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Αρχική σελίδα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2935,27 +2985,27 @@ msgstr "Επιτυχία"
 msgid "Unknown error"
 msgstr "Άγνωστο Σφάλμα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Αρχείο φύλαξης εκτός δικτύου"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Η επαφή δεν βρέθηκε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Το αναγνωριστικό επαφής υπάρχει ήδη"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
@@ -2966,61 +3016,61 @@ msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS δεν είναι διαθέσιμο"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Άλλο σφάλμα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "Α_πόρριψη"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "Σφάλμα προσθήκης επαφής"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Σφάλμα τροποποίησης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Σφάλμα τροποποίησης επαφής"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Σφάλμα κατάργησης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "Σφάλμα αφαίρεσης επαφής"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3029,7 +3079,7 @@ msgstr ""
 "Το άνοιγμα %d επαφών θα ανοίξει και %d νέα παράθυρα.\n"
 "Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις επαφές?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3038,49 +3088,49 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Σφάλμα αποθήκευσης  %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 "λίστα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Μετακίνηση επαφής σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Αντιγραφή επαφής σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Μετακίνηση επαφών σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Αντιγραφή επαφών σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr "Επιλογή βιβλίου διευθύνσεων στόχου"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Πολλαπλές Εκάρτες"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard για %s"
@@ -3116,33 +3166,31 @@ msgstr "Προσθήκη διεύθυνσης στην υπάρχουσα επα
 msgid "Querying Address Book..."
 msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Επεξεργασία Πληροφοριών Επαφής"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Συγχώνευση Διεύθυνσης E-mail"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "και %d άλλες επαφές."
-
-#: 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 "και άλλη μία επαφή."
+msgid_plural "and %d other contacts."
+msgstr[0] "και άλλη μία επαφή."
+msgstr[1] "και άλλη μία επαφή."
 
-#: 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 "Εμφάνιση πλήρους VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Εμφάνιση μικρής VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
 
@@ -3290,7 +3338,7 @@ msgstr "Περιθώρια"
 msgid "Number of columns:"
 msgstr "Αριθμός στηλών:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -3376,7 +3424,8 @@ msgstr "Δοκιμή εκτύπωσης επεξεργαστή στυλ επαφ
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr "Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφώ"
+msgstr ""
+"Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφώ"
 
 #: addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
@@ -3421,7 +3470,8 @@ msgid "Export in asynchronous mode "
 msgstr "Εξαγωγή σε ασύγχρονη κατάσταση"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "Ο αριθμός των καρτών σε ένα αρχείο αποτελέσματος σε ασύγχρονη κατάσταση, "
 "προεπιλεγμένο μέγεθος 100."
@@ -3431,7 +3481,8 @@ msgid "NUMBER"
 msgstr "ΑΡΙΘΜΟΣ"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Σφάλμα παραμέτρων γραμμής εντολών, παρακαλώ χρησιμοποιήστε --help για να "
 "δείτε την χρήση."
@@ -3469,7 +3520,7 @@ msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Εισάγετε κωδικό"
 
@@ -3490,7 +3541,8 @@ msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
 #: calendar/conduits/calendar/calendar-conduit.c:1436
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
@@ -3499,7 +3551,8 @@ msgstr "Προκαθορισμένη Προτεραιότητα:"
 #: calendar/conduits/todo/todo-conduit.c:945
 #: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
@@ -3546,7 +3599,7 @@ msgid "Evolution's Tasks component"
 msgstr "Στοιχείο Εργασιών του Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1138 calendar/gui/print.c:1819
+#: 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"
@@ -3592,24 +3645,24 @@ msgstr "Χρόνος της χρονική μετάθεσης (λεπτά)"
 msgid "_Edit appointment"
 msgstr "_Επεξεργασία ραντεβού"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr "Απαλλαγή"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr "Απαλλαγή όλων"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3622,12 +3675,12 @@ msgstr ""
 "Ξεκινάει στις %s\n"
 "Τελειώνει στις %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 "Προειδοποίηση"
 
-#: 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"
@@ -3639,7 +3692,7 @@ msgstr ""
 "αποστολή e-mail το Evolution θα εμφανίσει ένα παράθυρο\n"
 "διαλόγου με μια κανονική υπενθύμιση."
 
-#: 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 "
@@ -3656,7 +3709,7 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την εκτέλεση του προγράμματος;"
 
-#: 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 "Να μην ξαναγίνει η ερώτηση για αυτό το πρόγραμμα."
 
@@ -3710,7 +3763,8 @@ msgstr "Ώρα έναρξης της εργάσιμης μέρας"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
-msgstr "Διαατήματα που προβάλλονται στις προβολές Ημέρας και εργάσιμης εβδομάδας"
+msgstr ""
+"Διαατήματα που προβάλλονται στις προβολές Ημέρας και εργάσιμης εβδομάδας"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
@@ -3825,9 +3879,9 @@ msgstr "Η περιγραφή περιέχει"
 msgid "Unmatched"
 msgstr "Αταίριαστο"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1585
-#: 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 "Ημερολόγιο"
 
@@ -3846,7 +3900,7 @@ msgid "Purge events older than"
 msgstr "Εκκαθάριση γεγονότων παλαιότερων από"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "ημέρες"
 
@@ -3857,7 +3911,7 @@ 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.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1578 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 "%d %a %b"
 
@@ -3879,74 +3933,76 @@ 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 "Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Νέο Ημερολόγιο"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Νέο Ραντεβού"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "Ρ_αντεβού"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Δημιουργία νέου ραντεβού"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Νέα συνάντηση"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "Συ_νάντηση"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Δημιουργία νέας αίτησης συνάντησης"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Νέο ολοήμερο ραντεβού"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "All _Day Ραντεβού"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Δημιουργία ένος νέου ολοήμερου ραντεβού"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Νέη ημερολόγιο"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "Η_μερολόγιο"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Δημιουργία νέου ημερολογίου"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Αδυναμία ανοίγματος του ημερολογίου  '%s' για την δημιουργία γεγονότων και "
 "συναντήσεων"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
-msgstr "Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
+msgstr ""
+"Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
 
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
@@ -3974,10 +4030,6 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Προβολή λίστας"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Σφάλμα κατά το άνοιγμα του ημερολογίου"
@@ -3995,16 +4047,16 @@ msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγ
 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 "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Ο τύπος της προβολής για εμφάνιση"
 
@@ -4068,11 +4120,11 @@ msgstr "διάλογος1"
 msgid "extra times every"
 msgstr "επιπλέον φορές κάθε"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ώρες"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -4095,11 +4147,11 @@ msgstr "Βασικά"
 msgid "Date/Time:"
 msgstr "Ημερομηνία/Ώρα:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "Εμφάνιση μηνύματος"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Εκτέλεση ήχου"
 
@@ -4107,17 +4159,17 @@ msgstr "Εκτέλεση ήχου"
 msgid "Reminders"
 msgstr "Υπενθυμίσεις"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Εκτέλεσε ένα πρόγραμμα"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 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 "Αποστολή e-mail"
 
 #: 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 "Περίληψη:"
@@ -4148,7 +4200,7 @@ msgid "hour(s)"
 msgstr "ώρα(ες)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
@@ -4158,8 +4210,8 @@ msgstr "αρχή ραντεβού"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
@@ -4173,19 +4225,19 @@ msgstr "Όχι απομάκρυνση"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
@@ -4209,7 +4261,7 @@ msgstr "30 λεπτά"
 msgid "60 minutes"
 msgstr "60 λεπτά"
 
-#: 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 "Ειδοποιήσεις"
 
@@ -4234,7 +4286,7 @@ msgid "Days"
 msgstr "Ημέρες"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
@@ -4329,7 +4381,7 @@ msgid "Wednesday"
 msgstr "Τετάρτη"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Εργάσιμη Εβδομάδα"
 
@@ -4374,7 +4426,6 @@ msgid "_Fri"
 msgstr "_Παρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Γενικά"
 
@@ -4475,7 +4526,7 @@ msgstr ""
 "εισάγει εδώ."
 
 #: 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 "Νέα λίστα εργασιών"
 
@@ -4702,8 +4753,9 @@ msgstr "Ημερολογιακή καταχώριση - %s"
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-calendar-view.c:1050
-#: 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 "Αποθήκευση ως..."
 
@@ -4719,15 +4771,15 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Δεν ήταν δυνατή η εκτέλεση της τρέχουσας έκδοση!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:58
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:66
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "Αδύνατο το άνοιγμα προορισμού"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:75
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "Ο προορισμός είναι μόνο για ανάγνωση"
 
@@ -4756,22 +4808,29 @@ msgstr "Είστε βέβαιοι για την διαγραφή της κατα
 
 #: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
+msgstr ""
+"Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
+#, 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] "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
+msgstr[1] "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
+#: 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] "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
+msgstr[1] "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
+#: 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] "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
+msgstr[1] "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4799,7 +4858,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
@@ -4906,8 +4966,6 @@ msgstr "Ημερολόγιο:"
 
 #: 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 "Ταξινόμηση"
 
@@ -4958,10 +5016,10 @@ msgstr "Χρόνος Έ_ναρξης:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:774
-#: 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:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5021,13 +5079,13 @@ msgid "Member"
 msgstr "Μέλος"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "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
@@ -5090,15 +5148,19 @@ msgstr "Όνομα λίστας εργασιών"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε?"
+msgstr ""
+"Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε?"
+msgstr ""
+"Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5199,7 +5261,7 @@ msgid "_No recurrence"
 msgstr "_Χωρίς επανεμφάνιση"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr "Α_φαίρεση"
 
@@ -5241,7 +5303,7 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
 
-#: 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 "Α_πόρριψη Αλλαγών"
 
@@ -5249,21 +5311,44 @@ msgstr "Α_πόρριψη Αλλαγών"
 msgid "Save Event"
 msgstr "Αποθήκευση Γεγονότος"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Επιλογή εισαγωγής"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr "Επιλογή προορισμού %s"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "ημερολόγιο"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "λίστα εργασιών"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Η πληροφορίες της συνάντησης έχουν δημιουργηθεί. Να αποσταλούν?"
 
 #: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
-msgstr "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr ""
+"Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
+msgstr ""
+"Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
-msgstr "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr ""
+"Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
 
 #: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
@@ -5284,7 +5369,7 @@ msgstr "Ολοκληρώθηκε"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr "Υψηλή"
 
@@ -5297,13 +5382,13 @@ msgstr "Σε Εξέλιξη"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "Χαμηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:864 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 "Κανονική"
 
@@ -5368,9 +5453,9 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιώ�
 msgid "Con_fidential"
 msgstr "_Εμπιστευτικό"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -5437,131 +5522,113 @@ msgid "Weekly"
 msgstr "Εβδομαδιαίως"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d ημέρες"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 ημέρα"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d εβδομάδες"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 εβδομάδα"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d ώρες"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 ώρα"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ημέρες"
+msgstr[1] "%d ημέρες"
 
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d λεπτά"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d εβδομάδες"
+msgstr[1] "%d εβδομάδες"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 λεπτό"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ώρες"
+msgstr[1] "%d ώρες"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d δευτερόλεπτα"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d λεπτά"
+msgstr[1] "%d λεπτά"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 δευτερόλεπτο"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d δευτερόλεπτα"
+msgstr[1] "%d δευτερόλεπτα"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Εκτέλεση άγνωστης ενέργειας"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s πριν την αρχή του ραντεβού"
 
-#: 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 πριν την αρχή του ραντεβού"
 
-#: 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 στην αρχή του ραντεβού"
 
-#: 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 πριν το τέλος του ραντεβού"
 
-#: 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 μετά το τέλος του ραντεβού"
 
-#: 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 στο τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s στις %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 για άγνωστο τύπο ενεργοποίησης"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:312
-#: calendar/gui/e-cal-model.c:319 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Δημόσιο"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:321
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Ιδιωτικό"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:323
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Εμπιστευτικό"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Περιγραφή"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Ημερομηνία"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Περίληψη"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr " χρώμα"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "στοιχείο"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Διαθέσιμη"
@@ -5597,141 +5664,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ναι"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Όχι"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:325 calendar/gui/e-cal-model.c:328
-#: 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:2118
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: calendar/gui/e-cal-model.c:866
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Επανάληψη"
 
-#: calendar/gui/e-cal-model.c:868
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Ανάθεση"
 
-#: calendar/gui/e-calendar-view.c:670 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Διαγραφή επιλεγμένων αντικειμένων"
-
-#: calendar/gui/e-calendar-view.c:771 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Αναβάθμιση Αντικειμένων"
-
-#: calendar/gui/e-calendar-view.c:1221 calendar/gui/e-calendar-view.c:1306
-msgid "New _Appointment..."
-msgstr "Νέο Ρ_αντεβού..."
-
-#: calendar/gui/e-calendar-view.c:1222 calendar/gui/e-calendar-view.c:1308
-msgid "New All Day _Event"
-msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
-
-#: calendar/gui/e-calendar-view.c:1223 calendar/gui/e-calendar-view.c:1310
-msgid "New Meeting"
-msgstr "Νέα Συνάντηση"
-
-#: calendar/gui/e-calendar-view.c:1224 calendar/gui/e-calendar-view.c:1312
-msgid "New Task"
-msgstr "Νέα Εργασία"
-
-#: calendar/gui/e-calendar-view.c:1228 calendar/gui/e-calendar-view.c:1251
-#: calendar/gui/e-calendar-view.c:1318 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 "_Εκτύπωση..."
-
-#: calendar/gui/e-calendar-view.c:1232 calendar/gui/e-calendar-view.c:1258
-#: calendar/gui/e-calendar-view.c:1316 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 "Επι_κόλληση"
-
-#: calendar/gui/e-calendar-view.c:1238 calendar/gui/e-calendar-view.c:1302
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Μετάβαση στο _Σήμερα"
-
-#: calendar/gui/e-calendar-view.c:1239 calendar/gui/e-calendar-view.c:1304
-msgid "_Go to Date..."
-msgstr "_Μετάβαση στην Ημερομηνία..."
-
-#: calendar/gui/e-calendar-view.c:1243 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
-
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Άνοιγμα"
-
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1320
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:128
-msgid "_Save As..."
-msgstr "Αποθήκευση _ως..."
-
-#: calendar/gui/e-calendar-view.c:1256 calendar/gui/e-calendar-view.c:1296
-#: 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 "_Αποκοπή"
-
-#: calendar/gui/e-calendar-view.c:1257 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2437 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 "Αντι_γραφή"
-
-#: calendar/gui/e-calendar-view.c:1262
-msgid "_Schedule Meeting..."
-msgstr "Προγραμματισμός _Συνάντησης..."
-
-#: calendar/gui/e-calendar-view.c:1263
-msgid "_Forward as iCalendar..."
-msgstr "Προώ_θηση ως iCalendar..."
-
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1299
-msgid "Delete this _Occurrence"
-msgstr "Διαγραφή αυτής της _Εμφάνισης"
-
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1300
-msgid "Delete _All Occurrences"
-msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
-
-#: calendar/gui/e-calendar-view.c:1322 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Ρυθμίσεις..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5776,32 +5741,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 "Διαγραφή επιλεγμένων αντικειμένων"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Αναβάθμιση Αντικειμένων"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Άνοιγμα"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Άνοιγμα Ιστο_σελίδας"
 
-#: 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 "Αποθήκευση _ως..."
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "_Εκτύπωση..."
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Αποκοπή"
+
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "Αντι_γραφή"
+
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "Επι_κόλληση"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Ανάθεση Εργασίας"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "Προώ_θηση ως i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: 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 "_Διαγραφή Επιλεγμένων Εργασιών"
 
-#: 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 "Κλικ εδώ για προσθήκη εργασίας"
 
@@ -5810,46 +5828,101 @@ msgstr "Κλικ εδώ για προσθήκη εργασίας"
 msgid "% Complete"
 msgstr "% Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Ειδοποιήσεις"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:5
 #, fuzzy
 msgid "Completion date"
 msgstr "Ημερομηνία Ολοκλήρωσης"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Due date"
 msgstr "Ημερομηνία Λήξης"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#, fuzzy
-msgid "Geographical position"
-msgstr "Γεωγραφική Θέση"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:8
 #, fuzzy
 msgid "Start date"
 msgstr "Ημερομηνία Έναρξης"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
-#: 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 "Νέο Ρ_αντεβού..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Νέα Συνάντηση"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Νέα Εργασία"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Επιλογή _Θέματος"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Επιλο_γή..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Αντιγραφή σε Φάκελο..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Με_τακίνηση στο Φάκελο..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "Προγραμματισμός _Συνάντησης..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "Προώ_θηση ως iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Διαγραφή αυτής της _Εμφάνισης"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Μετάβαση στο _Σήμερα"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Μετάβαση στην Ημερομηνία..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Ρυθμίσεις..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5881,26 +5954,26 @@ msgstr "%02i τμήματα λεπτών"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1561
+#: 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.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1594
+#: 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:810 calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "πμ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:813 calendar/gui/e-week-view.c:598
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "μμ"
@@ -5909,106 +5982,98 @@ msgstr "μμ"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ναι. (Σύνθετη επανεμφάνιση)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Κάθε ημέρα"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Κάθε %d ημέρες"
+msgid_plural "Every %d days"
+msgstr[0] "Κάθε ημέρα"
+msgstr[1] "Κάθε ημέρα"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Κάθε εβδομάδα"
+msgid_plural "Every %d weeks"
+msgstr[0] "Κάθε εβδομάδα"
+msgstr[1] "Κάθε εβδομάδα"
 
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Κάθε %d εβδομάδες"
-
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Κάθε εβδομάδα στις"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Κάθε εβδομάδα στις"
+msgstr[1] "Κάθε εβδομάδα στις"
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Κάθε %d εβδομάδες σε"
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " και"
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "Την %s ημέρα της"
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "Την %s %s του"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "κάθε  μήνα"
+msgid_plural "every %d months"
+msgstr[0] "κάθε  μήνα"
+msgstr[1] "κάθε  μήνα"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "κάθε %d μήνες"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Κάθε χρόνο"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Κάθε %d χρόνια"
+msgid_plural "Every %d years"
+msgstr[0] "Κάθε χρόνο"
+msgstr[1] "Κάθε χρόνο"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr "σύνολο %d φορές"
+#: 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] "σύνολο %d φορές"
+msgstr[1] "σύνολο %d φορές"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", τελειώνει στις"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Ξεκινάει:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Τελειώνει:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Ολοκληρώθηκε:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Λήγει:</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"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "Σφάλμα iCalendar"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6016,318 +6081,320 @@ msgstr ""
 "<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια "
 "ενέργεια από το παρακάτω μενού."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Τοποθεσία:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Επιλέξτε μια ενέργεια:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Απόκρυψη"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Αποστολή πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Ανανέωση κατάστασης απάντησης"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία του %s σε μια συνάντηση."
 
-#: 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> παρακαλεί την παρουσία σας σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Πρόταση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Ανανέωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> θα ήθελε να παραλάβει τις τελευταίες πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Αίτη_ση Ανανέωσης Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> έχει απαντήσει σε μία πρόσκληση σε συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Απάντηση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ακύρωσε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Ακύρωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "ο/η <b>%s</b> έστειλε ένα ακατανόητο μήνυμα."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Εσφαλμένο Μήνυμα Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες εργασιών."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ζητάει από τον %s να εκτελέσει μια εργασία."
 
-#: 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> σας έχει ζητήσει να εκτελέσετε μια εργασία"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Πρόταση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> θα ήθελε την τελευταία πληροφορία εργασιών."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Αίτηση _Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> απάντησε σε μια ανάθεση εργασίας"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Απάντηση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> έχει ακυρώσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Ακύρωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr " Μήνυμα Κακής Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> έχει δημοσίευση πληροφορίες διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Πληροφορίες Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Αίτηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Απάντηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "Αυτό το μήνυμα δεν φαίνεται να έχει συνταχθεί σωστά."
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Το μήνυμα περιέχει μόνο αιτήσεις που δεν υποστηρίζονται"
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει έγκυρο αρχείο ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
-msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
+msgstr ""
+"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\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 ""
 "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
 "δεν υπάρχει πλέον"
 
-#: 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 "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\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 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
+msgstr ""
+"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης\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 "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\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 "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\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 "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
@@ -6544,12 +6611,12 @@ msgstr "Προτεραιότητα:"
 msgid "Web Page:"
 msgstr "Ιστοσελίδα:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Κλικ για άνοιγμα %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1902
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6559,7 +6626,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:792 calendar/gui/gnome-cal.c:1923
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6596,37 +6663,42 @@ msgstr "Ολοκλήρωση εργασιών..."
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:1062
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/gnome-cal.c:1737
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "Φόρτωση εργασιών σε %s"
-
-#: calendar/gui/gnome-cal.c:1749
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Φόρτωση ραντεβού σε %s"
 
-#: calendar/gui/gnome-cal.c:1782
+#: calendar/gui/gnome-cal.c:1779
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "Φόρτωση εργασιών σε %s"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα %s."
 
-#: calendar/gui/gnome-cal.c:1931
-#, 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:2775
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Εκκαθάριση"
 
@@ -6647,44 +6719,46 @@ msgid "February"
 msgstr "Φεβρουάριος"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Πήγαινε στην Ημερομηνία"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Ιούλιος"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Ιούνιος"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Μάρτιος"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Μάιος"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Οκτώβριος"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Επιλογή όλου του κειμένου"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Σεπτέμβριος"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Πήγαινε στο Σήμερα"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Επιλογή Φακέλου"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6774,7 +6848,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Γενέθλια και επέτειοι"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "Στον δικτυακό ιστό"
 
@@ -7016,38 +7090,38 @@ msgstr ""
 "Η λίστα εργασιών '%s' θα απομακρυνθεί. Είστε σίγουροι ότι θέλετε να "
 "συνεχίσετε?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Νέα εργασία"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Εργασία"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Δημιουργία νέας εργασίας"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Νέα λίστα εργασιών"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "Λίσ_τα Εργασιών"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Δημιουργία νέας λίστας εργασιών"
 
-#: 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 ""
 "Αδυναμία ανοίγματος της λίστας εργασιών '%s' για την δημιουργία γεγονότων "
 "και συναντήσεων"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία εργασιών"
 
@@ -8730,9 +8804,10 @@ msgstr "Μεταφόρτωση νέων μηνυμάτων για εργασία
 msgid "Preparing folder '%s' for offline"
 msgstr "Προετοιμασία φακέλου  '%s' για εργασία χωρίς σύνδεση"
 
-#: camel/camel-disco-store.c:372
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
-msgstr "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
+msgstr ""
+"Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
@@ -8858,7 +8933,8 @@ msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτησ
 #: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
+msgstr ""
+"Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
 
 #: camel/camel-folder.c:1335
 msgid "Moving messages"
@@ -8907,7 +8983,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
@@ -8968,7 +9044,8 @@ msgstr "Αυτό το σημείο του μηνύματος είναι ψηφι
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: Εσφαλμένη μορφή μηνύματος"
+msgstr ""
+"Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: Εσφαλμένη μορφή μηνύματος"
 
 #: camel/camel-gpg-context.c:1397
 #, c-format
@@ -9007,7 +9084,8 @@ msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμ
 #: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
+msgstr ""
+"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
 
 #: camel/camel-lock-client.c:204
 #, c-format
@@ -9022,7 +9100,8 @@ msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλ
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
+msgstr ""
+"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -9205,7 +9284,8 @@ msgstr "Μη έγκυρο challenge διακομιστή\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
+msgstr ""
+"Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9213,7 +9293,8 @@ msgstr "Στην απάντηση του διακομιστή δεν υπάρχ�
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
+msgstr ""
+"Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9275,7 +9356,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "Το παρεχόμενο χειριστήριο περιεχομένου δεν αναφέρετε σε έγκυρο περιεχόμενο."
+msgstr ""
+"Το παρεχόμενο χειριστήριο περιεχομένου δεν αναφέρετε σε έγκυρο περιεχόμενο."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9292,7 +9374,7 @@ msgstr "Τα αναφερόμενα διαπιστευτήρια έχουν λή
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -9311,7 +9393,8 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στο διακομιστή με την πιστοποίηση Kerberos 4."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στο διακομιστή με την πιστοποίηση Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -9328,7 +9411,8 @@ msgstr "Είσοδος"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Με την επιλογή αυτή θα γίνει σύνδεση στο διακομιστή με χρήση ενός κωδικού."
+msgstr ""
+"Με την επιλογή αυτή θα γίνει σύνδεση στο διακομιστή με χρήση ενός κωδικού."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -9405,7 +9489,8 @@ msgstr "Αποτυχία στην αναζήτηση ονόματος: %s"
 #: camel/camel-service.c:785 camel/camel-service.c:909
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Αποτυχία στην αναζήτηση συστήματος: Αδυναμία δημιουργίας αλληλουχίας: %s"
+msgstr ""
+"Αποτυχία στην αναζήτηση συστήματος: Αδυναμία δημιουργίας αλληλουχίας: %s"
 
 #: camel/camel-service.c:798
 #, c-format
@@ -9488,29 +9573,32 @@ msgstr "Σφάλμα ανάλυσης"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Υπογράφων: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
 #: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου`%s': ο φάκελος υπάρχει"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: 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 "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1083
+#: 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 "Ανεπιθύμητη αλληλογραφία"
@@ -9755,7 +9843,8 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 #: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
+msgstr ""
+"Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
 
 #: camel/camel-vtrash-folder.c:44
 msgid "Cannot copy messages to the Trash folder"
@@ -9763,7 +9852,8 @@ msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων σ
 
 #: camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων στον φάκελο ανεπιθύμητης αλληλογραφίας"
+msgstr ""
+"Δεν ήταν δυνατή η αντιγραφή μηνυμάτων στον φάκελο ανεπιθύμητης αλληλογραφίας"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
@@ -9777,38 +9867,40 @@ msgstr "Έλεγχος για νέα μηνύματα σε όλους τους �
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα Εισερχόμενα σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα Εισερχόμενα σ' αυτόν τον διακομιστή"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Αυτόματος συγχρονισμός απομακρυσμένης αλληλογραφίας τοπικά"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "Όνομα Διακομιστή LDAP:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Βιβλίο Διευθύνσεων"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Βάση  αναζήτησης:"
+#: 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 "Για την πρόσβαση σε εξυπηρετητές Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9816,8 +9908,8 @@ msgstr ""
 "Με την επιλογή αύτη θα γίνει σύνδεση στο διακομιστή IMAP με χρήση κωδικού "
 "απλού κειμένου."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "λίστα"
@@ -9825,12 +9917,12 @@ msgstr "λίστα"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2914
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2917
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
@@ -9888,12 +9980,12 @@ msgstr "Ο φάκελος καταστράφηκε και ξαναδημιουρ
 msgid "Scanning for changed messages"
 msgstr "Γίνεται σάρωση για αλλαγμένα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:1926
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Αδυναμία ανάκτησης μηνύματος: %s "
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: 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
@@ -9909,25 +10001,25 @@ msgstr ""
 "Δεν μπορεί να γίνει η λήψη του μηνύματος: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
 
-#: camel/providers/imap/camel-imap-folder.c:1995
-#: camel/providers/imap/camel-imap-folder.c:2591
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την στιγμή"
 
-#: camel/providers/imap/camel-imap-folder.c:2255
-#: camel/providers/imap/camel-imap-folder.c:2325
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Λήψη πληροφορίες περίληψης για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:2629
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "Αδυναμία εύρεσης σώματος μηνύματος στην απάντηση FETCH."
 
@@ -9980,7 +10072,8 @@ msgstr "Namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
 
 #: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
@@ -10000,18 +10093,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Διακομιστής IMAP %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 για %s στο %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
@@ -10021,14 +10114,14 @@ msgstr "Υπηρεσία IMAP για %s στο %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %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 δεν είναι διαθέσιμο"
 
-#: 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
@@ -10036,49 +10129,51 @@ msgstr "SSL δεν είναι διαθέσιμο"
 msgid "Connection cancelled"
 msgstr "Η σύνδεση ακυρώθηκε"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %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  δεν υποστηρίζεται"
 
-#: 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"
 
-#: 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 "Δεν ήταν δυνατή η σύνδεση με την εντολή \"%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 %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
+msgstr ""
+"Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %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 "Μη υποστηριζόμενος τύπος πιστοποίησης %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 "%sΠαρακαλώ εισάγετε τον κωδικό IMAP για %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 "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: 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"
@@ -10089,13 +10184,22 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1771
-#: camel/providers/imap/camel-imap-store.c:1852
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1793
+#: 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 ""
+"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
+"χαρακτήρα \"%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
@@ -10103,19 +10207,12 @@ msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: `%s': ο φάκελος υπάρχει"
 
-#: camel/providers/imap/camel-imap-store.c:2053
-#, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
-"χαρακτήρα \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2101
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
@@ -10150,20 +10247,20 @@ msgid "Index message body data"
 msgstr "Δεδομένα σώματος μηνύματος καταλόγου"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: 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:392
-#: camel/providers/local/camel-local-folder.c:395
+#: 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:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10271,7 +10368,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου �
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:418
 #: camel/providers/local/camel-mbox-store.c:320
@@ -10346,21 +10444,21 @@ msgstr "δεν είναι κατάλογος maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Δεν ήταν δυνατή η σάρωση του φακέλου `%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 "Δεν είναι δυνατό να βρεθεί η θέση καταλόγου maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Έλεγχος συνάφειας φακέλου"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Έλεγχος για νέα μηνύματα"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10474,7 +10572,8 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα του φακέλου:
 #: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στο φάκελο %s"
+msgstr ""
+"Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στο φάκελο %s"
 
 #: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
@@ -10505,7 +10604,7 @@ msgstr "Δεν ήταν δυνατό το κλείσιμο του φακέλου
 msgid "Could not close temp folder: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του προσωρινού φακέλου:%s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2399
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου : %s"
@@ -10713,7 +10812,8 @@ msgstr "Αποτυχία αποστολής κεφαλίδας συζητήσε�
 #: camel/providers/nntp/camel-nntp-folder.c:417
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Αποτυχία αποστολής στην ομάδα συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
+msgstr ""
+"Αποτυχία αποστολής στην ομάδα συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
 
 #: camel/providers/nntp/camel-nntp-folder.c:429
 msgid "Error reading response to posted message: message not posted"
@@ -10750,8 +10850,10 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Αδυναμία αποθήκευσης αρχείου λίστας ομάδας για %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Εμφάνιση φακέλων σε σύντμηση (π.χ l.g.linux αντί για local.greek.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Εμφάνιση φακέλων σε σύντμηση (π.χ l.g.linux αντί για local.greek.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -10842,46 +10944,46 @@ msgstr ""
 "Αδύνατη η απομάκρυνση φακέλου σε ένα News store: καλύτερα να αποχωρήσετε απο "
 "την ομάδα."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "Σφάλμα σύνδεσης: %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 "Δεν υπάρχει τέτοιος φάκελος %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 "Αδυναμία λήψης ομάδας: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr "Δεν είναι δυνατή η λήψη μηνυμάτων: ακαθόριστο σφάλμα"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Η εντολή NNTP απέτυχε: %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: Σάρωση για νέα μηνύματα"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Άγνωστη απάντηση διακομιστή: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Χρήση ακύρωσης"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Η λειτουργία απέτυχε: %s"
@@ -10928,7 +11030,7 @@ msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Απενεργοποίηση υποστήριξης για όλες τις επεκτάσεις  POP3 "
 
-#: 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"
 
@@ -10965,7 +11067,8 @@ msgstr "Δεν ήταν δυνατή η σύνδεση στο διακομιστ
 #: camel/providers/pop3/camel-pop3-store.c:268
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:366
 #, c-format
@@ -11018,7 +11121,7 @@ msgid "No such folder `%s'."
 msgstr "Δεν υπάρχει ο φάκελος `%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"
 
@@ -11064,7 +11167,8 @@ msgstr "Δεν είναι δυνατό να εκτελεστεί το %s: το �
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
+msgstr ""
+"το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
@@ -11074,12 +11178,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: 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 ""
 "Για τη παράδοση μηνυμάτων με την σύνδεση σε απομακρυσμένο mailhub με χρήση "
 "SMTP.\n"
@@ -11158,7 +11263,8 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
+msgstr ""
+"Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
 
 #: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
@@ -11196,7 +11302,8 @@ msgstr "Σφάλμα απάντησης Welcome"
 #: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
@@ -11215,7 +11322,8 @@ msgstr "Η εντολή IMAP απέτυχε: %s"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
+msgstr ""
+"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11246,7 +11354,8 @@ msgstr "Παράδοση μηνυμάτων μέσω %s"
 #: camel/providers/smtp/camel-smtp-transport.c:686
 #, fuzzy
 msgid "Cannot send message: service not connected."
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
 
 #: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
@@ -11260,7 +11369,8 @@ msgstr "Γίνεται αποστολή μηνύματος"
 
 #: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
 
 #: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
@@ -11361,44 +11471,44 @@ msgstr "Η εντολή IMAP απέτυχε: %s"
 msgid "QUIT command failed"
 msgstr "Η εντολή IMAP απέτυχε: %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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "συννημένο"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr "Αφαίρεση επιλεγμένων αντικειμένων από τον κατάλογο συννημένων"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Προσθήκη συννημένου..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Δεν είναι δυνατή η επισύναψη του αρχείου %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 "Δεν είναι δυνατή η επισύναψη του αρχείου %s: δεν είναι κανονικό αρχείο"
@@ -11420,19 +11530,19 @@ msgstr "Τύπος MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr "Πρέπει να ρυθμίσετε έναν λογαριασμό πριν από την συγγραφή μηνύματος."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Προορισμός αποστολής"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Επιλέξτε τους φακέλους για να αποστείλετε μήνυμα σε αυτούς."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Κλικ εδώ για το βιβλίο διευθύνσεων"
 
@@ -11443,45 +11553,45 @@ msgstr "Κλικ εδώ για το βιβλίο διευθύνσεων"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Απάντηση Σε:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Από:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Προς:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11492,25 +11602,27 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Αποστολή Σε:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
-msgstr "Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
+msgstr ""
+"Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
 
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Επισύναψη αρχείου(ων)"
 
-#: composer/e-msg-composer.c:652
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+#: composer/e-msg-composer.c:662
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
 "υπογραφής από τον λογαριασμό."
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11518,7 +11630,7 @@ msgstr ""
 "Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
 "κρυπτογράφησης  από τον λογαριασμό."
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11527,30 +11639,30 @@ msgstr ""
 "Σφάλμα κατά την ανάγνωση του αρχείου %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Σφάλμα κατά την αποθήκευση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Σφάλμα κατά το φόρτωμα του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Σφάλμα κατά την προσπέλαση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11559,7 +11671,7 @@ msgstr ""
 "Αδύνατη η αναζήτηση στο αρχείο: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11568,7 +11680,7 @@ msgstr ""
 "Αδυναμία  truncate αρχείου: %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"
@@ -11577,7 +11689,7 @@ msgstr ""
 "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11586,7 +11698,7 @@ msgstr ""
 "Σφάλμα κατά την αυτόματη αποθήκευση του μηνύματος: %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?"
@@ -11595,7 +11707,7 @@ msgstr ""
 "προηγούμενη συνεδρία.\n"
 "Θέλετε να γίνει προσπάθεια ανάκτηση τους;"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11606,48 +11718,48 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Υπογραφή:"
-
-#: 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 "Αυτόματη δημιουργία"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Υπογραφή:"
+
+#: 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> αρχείο επισυνάφθηκε"
 msgstr[1] "<b>%d</b> αρχεία επισυνάφθηκαν"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Απόκρυψη εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Εμφάνιση εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11655,7 +11767,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
-#: 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"
@@ -11667,7 +11779,7 @@ msgstr ""
 "Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
 "gtkhtml και libgtkhtml.\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."
@@ -11675,7 +11787,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
 
-#: 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>"
@@ -11822,7 +11934,8 @@ msgstr "Απομνημόνευση του κωδικού πρόσβασης"
 
 #: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
-msgstr "Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
@@ -11918,90 +12031,81 @@ 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 δευτερόλεπτο πριν"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d δευτερόλεπτα πριν"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 δευτερόλεπτο πριν"
+msgstr[1] "1 δευτερόλεπτο πριν"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 λεπτό πριν"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d λεπτά πριν"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 λεπτό πριν"
+msgstr[1] "1 λεπτό πριν"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 ώρα πριν"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d ώρες πριν"
+msgid_plural "%d hours ago"
+msgstr[0] "1 ώρα πριν"
+msgstr[1] "1 ώρα πριν"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 ημέρα πριν"
+msgid_plural "%d days ago"
+msgstr[0] "1 ημέρα πριν"
+msgstr[1] "1 ημέρα πριν"
 
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d ημέρες πριν"
-
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 εβδομάδα πριν"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 εβδομάδα πριν"
+msgstr[1] "1 εβδομάδα πριν"
 
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d εβδομάδες πριν"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 μήνας πριν"
+msgid_plural "%d months ago"
+msgstr[0] "1 μήνας πριν"
+msgstr[1] "1 μήνας πριν"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d μήνες πριν"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 έτος πριν"
+msgid_plural "%d years ago"
+msgstr[0] "1 έτος πριν"
+msgstr[1] "1 έτος πριν"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d έτη πριν"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Πρέπει να επιλέξετε μια ημερομηνία."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε ημερομηνία>"
 
-#: filter/filter-datespec.c:279 filter/filter-datespec.c:290
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "τώρα"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:286
+#: filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Κανόνες Φίλτρων"
+
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Πρέπει να επιλέξετε ένα όνομα αρχείου."
@@ -12026,7 +12130,7 @@ msgid "You must specify a folder."
 msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1098
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
@@ -12040,19 +12144,19 @@ 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 "Σημαντικό"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Πρός Τακτοποίηση"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Αργότερα"
 
@@ -12104,45 +12208,23 @@ msgstr "    "
 
 #: filter/filter.glade.h:2
 #, fuzzy
-msgid "<b>Filter Rules</b>"
-msgstr "Κανόνες Φίλτρων"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>Virtual _Folders</b>"
-msgstr "Εικονικοί Φάκελοι"
-
-#: filter/filter.glade.h:4
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
 msgstr "Κανόνες Φίλτρων"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 #, fuzzy
 msgid "<b>vFolder Sources</b>"
 msgstr "Πηγές εΦακέλων"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Σύγκριση με"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Επεξεργασία Φίλτρων"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Επεξεργασία ΕΦακέλων"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Εισερχόμενα"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Εξερχόμενα"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12150,7 +12232,7 @@ msgstr ""
 "Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
 "12:00am της ημερομηνίας που δίνετε εδώ."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12158,7 +12240,7 @@ msgstr ""
 "Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
 "με ώρα σχετική όταν λειτουργεί το φίλτρο."
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12166,51 +12248,51 @@ msgstr ""
 "Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
 "την τρέχουσα ώρα  όταν λειτουργεί το φίλτρο."
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "η ώρα σχετική με την τρέχουσα ώρα"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "πριν"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "μήνες"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "για τον συγκεκριμένους φακέλους"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "η τρέχουσα ώρα"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "ή ώρα που ορίζετε"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "εβδομάδες"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "με όλους τους ενεργούς απομακρυσμένους φακέλους"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "με όλους τους τοπικούς και ενεργούς απομακρυσμένους φακέλους"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "με όλους τους τοπικούς φακέλους"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "χρόνια"
 
@@ -12373,8 +12455,9 @@ msgid "Move to Folder"
 msgstr "Μετακίνηση σε Φάκελο"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Έξοδος από το πρόγραμμα"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12408,23 +12491,24 @@ msgstr "επιστρέφει μεγαλύτερο από"
 msgid "returns less than"
 msgstr "επιστρέφει λιγότερο από"
 
-#: 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 "Εκτέλεση προγράμματος:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Σκορ"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Αποστολέας"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Ορισμός Κατάστασης"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Εντολή Κέλυφους"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Μέγεθος (kB)"
@@ -12449,9 +12533,9 @@ msgstr "ξεκινά με"
 msgid "Stop Processing"
 msgstr "Τερματισμός Επεξεργασίας"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
-#: 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 "Θέμα"
@@ -12461,7 +12545,7 @@ msgid "Unset Status"
 msgstr "Ορισμός Κατάστασης"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Το όνομα κανόνα '%s' δεν είναι μοναδικό, επιλέξτε ένα άλλο."
@@ -12478,8 +12562,9 @@ msgstr "Επεξεργασία Κανόνα"
 msgid "Rule name"
 msgstr "'Όνομα κανόνα: "
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Κανόνες Σκορ"
 
 #: filter/searchtypes.xml.h:1
@@ -12514,6 +12599,11 @@ msgstr "Θέμα περιέχει"
 msgid "Subject does not contain"
 msgstr "Θέμα δεν περιέχει"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Εικονικοί Φάκελοι"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Πρέπει να δώσετε όνομα στον eφάκελο."
@@ -12531,14 +12621,16 @@ msgid "Composer Preferences"
 msgstr "Προτιμήσεις Επεξεργαστή"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
 "ασφάλειας και της προβολής μηνυμάτων"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -12572,8 +12664,8 @@ msgstr "Συστατικό για την προβολή φακέλου μηνυ�
 msgid "Evolution Mail preferences control"
 msgstr "Έλεγχος προτιμήσεων Evolution Mail "
 
-#: 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 "Μηνύματα"
@@ -12582,53 +12674,50 @@ msgstr "Μηνύματα"
 msgid "Mail Accounts"
 msgstr "Λογαριασμοί Αλληλογραφίας"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Προτιμήσεις Αλληλογραφίας"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Να μην διαγραφεί"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Προεπιλογή]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Όνομα λογαριασμού:"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr "Χωρίς τίτλο"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Θα πρέπει να καθορίσετε ένα έγκυρο όνομα δέσμης ενεργειών."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[δέσμη ενεργειών]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Γλώσσα"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Προσθήκη υπογραφής"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Υπογραφή(ές)"
 
@@ -12662,7 +12751,8 @@ msgstr ""
 
 #: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
-msgstr "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
+msgstr ""
+"Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
 
 #: mail/em-composer-utils.c:162
 msgid ""
@@ -12687,7 +12777,7 @@ msgstr ""
 "λογαριασμό.\n"
 "Θέλετε να κάνετε χρήση του προεπιλεγμένου προσωρινού φακέλου;"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα..."
 
@@ -12721,8 +12811,8 @@ msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2157
-#: 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 "Ορίστε που θα δημιουργηθεί ο φάκελος:"
@@ -12733,7 +12823,7 @@ msgid "Folder _name:"
 msgstr "_Όνομα φακέλου:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
@@ -12750,120 +12840,121 @@ msgstr "Εισερχόμενα"
 msgid "Loading..."
 msgstr "Γίνεται φόρτωση..."
 
-#: mail/em-folder-tree.c:867
+#: mail/em-folder-tree.c:877
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/em-folder-tree.c:869
+#: mail/em-folder-tree.c:879
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:886
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/em-folder-tree.c:878
+#: mail/em-folder-tree.c:888
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/em-folder-tree.c:894
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Αδυναμία μετακίνησης μηνυμάτων σε ένα toplevel store"
 
-#: mail/em-folder-tree.c:1887
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Δεν ήταν δυνατή η μετακίνηση του φακέλου %s: Άκυρη λειτουργία"
 
-#: mail/em-folder-tree.c:1916 mail/em-folder-tree.c:2092
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1932 mail/em-folder-tree.c:1945
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
 #: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: mail/em-folder-tree.c:1972
+#: mail/em-folder-tree.c:2035
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/em-folder-tree.c:2157 mail/mail-component.c:629
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Δημιουργία φακέλου"
 
-#: mail/em-folder-tree.c:2276
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου: %s"
 
-#: mail/em-folder-tree.c:2301
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Δεν ήταν δυνατή η διαγραφή του τοπικού φακέλου %s"
 
-#: mail/em-folder-tree.c:2307
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Αλήθεια να γίνει διαγραφή του φακέλου \"%s\" και όλων των υποφακέλων του?"
+msgstr ""
+"Αλήθεια να γίνει διαγραφή του φακέλου \"%s\" και όλων των υποφακέλων του?"
 
-#: mail/em-folder-tree.c:2317
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Διαγραφή \"%s\""
 
-#: mail/em-folder-tree.c:2351
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Δεν ήταν δυνατή η μετονομασία του τοπικού φακέλου %s."
 
-#: mail/em-folder-tree.c:2360
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: mail/em-folder-tree.c:2362
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: mail/em-folder-tree.c:2386
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Ένας φάκελος που ονομάζεται \"%s\" υπάρχει ήδη. Παρακαλώ χρησιμοποιείστε ένα "
 "διαφορετικό όνομα."
 
-#: mail/em-folder-tree.c:2432 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Προβολή"
 
-#: mail/em-folder-tree.c:2433
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Άνοιγμα σε _Νέο παράθυρο"
 
-#: mail/em-folder-tree.c:2438
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2442
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Νέος Φάκελος..."
 
-#: mail/em-folder-tree.c:2445
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: mail/em-folder-tree.c:2448 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
@@ -13002,7 +13093,7 @@ msgstr "Φίλτρο στην αλληλουχία"
 
 #. default charset used in mail view
 #: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Προεπιλογή"
 
@@ -13014,22 +13105,22 @@ msgstr "Εκτύπωση Μηνύματος"
 msgid "_Copy Link Location"
 msgstr "Αντι_γραφή τοποθεσίας δεσμού"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Κλικ εδώ για μήνυμα σε %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 "Ταιριάσματα: %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 "Μη υπογεγραμμένο"
 
-#: 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."
@@ -13037,11 +13128,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο. Δεν υπάρχει εγγύηση ότι το μήνυμαείναι "
 "αυθεντικό."
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr "Έγκυρη υπογραφή"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13049,11 +13140,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο και έγκυρο, ο αποστολέας του μηνύματος "
 "είναι και αυτός που ισχυρίζεται ότι είναι."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr "Μή έγκυρη υπογραφή"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13061,11 +13152,11 @@ msgstr ""
 "Η υπογραφή του μηνύματος δεν μπορεί να επιβεβαιωθεί, μπορεί να έχει "
 "αλλοιωθεί κατά  την μεταφορά."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13073,11 +13164,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο με μια έγκυρη υπογραφή, αλλά δεν είναι "
 "δυνατή η επιβεβαίωση του αποστολέα."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr "Αποκρυπτογραφημένο"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -13085,11 +13176,11 @@ msgstr ""
 "Αυτό το μήνυμα δεν είναι κρυπτογραφημένο. Το περιεχόμενο του μπορεί να "
 "αναγνωστεί κατά την μεταφορά του στο διαδίκτυο."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr "Αδύναμα κρυπτογραφημένο"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13099,11 +13190,11 @@ msgstr ""
 "κρυπτογράφησης. Θα είναι  δύσκολο αλλά όχι αδύνατο σε ένα τρίτο να διαβάσει "
 "το περιεχόμενο του μηνύματος μέσα  σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr "Κρυπτογραφημένο"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13111,11 +13202,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι κρυπτογραφημένο. Θα είναι δύσκολο σε ένα τρίτο να "
 "διαβάσει το περιεχόμενο του μηνύματος."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr "Ισχυρά κρυπτογραφημένο"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13125,31 +13216,31 @@ msgstr ""
 "Θα είναι εξαρετικά δύσκολο σε ένα τρίτο να διαβάσει το περιεχόμενο του "
 "μηνύματος μέσα σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "Προ_βολή πιστοποιητικού"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Το πιστοποιητικό δεν είναι αναγνώσιμο"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ολοληρώθηκε σε %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "'Εχουν λήξει:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "από %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "Προβολή μέ_σα στο μήνυμα"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "Απόκρυ_ψη"
 
@@ -13158,128 +13249,132 @@ msgstr "Απόκρυ_ψη"
 msgid "Page %d of %d"
 msgstr "Σελίδα %d από %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 "Παραλαμβάνεται  %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Δείκτης σε σελίδα FTP (%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 "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στη σελίδα \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Δείκτης σε τοπικό αρχείο (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Μορφοποίηση μηνυμάτων"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Από"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Απάντηση Σε"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Προς"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Αντίγραφο:"
 
-#: mail/em-format-html.c:1406 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 "Ιδιαίτερη Κοινοποίηση"
 
 #. pseudo-header
-#: mail/em-format-html.c:1516 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 "Πρόγραμμα αλληλογραφίας"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: 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:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: mail/em-format.c:985
+#: 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 επισύναψη"
 
-#: mail/em-format.c:1064 mail/em-format.c:1186
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Αδυναμία ανάλυσης μηνύματος S/MIME: Άγνωστο σφάλμα"
 
-#: mail/em-format.c:1084 mail/em-format.c:1104 mail/em-format.c:1128
-#: mail/em-format.c:1221
+#: 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 "Εσωτερικό σφάλμα: uid σε μή έγκυρη μορφή: %s"
 
-#: mail/em-format.c:1176
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησης για  multipart/encrypted"
 
-#: mail/em-format.c:1323
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
 
-#: mail/em-format.c:1342
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
 
-#: mail/em-format.c:1350
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
 
-#: mail/em-format.c:1350
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
 
-#: mail/em-format.c:1370
+#: mail/em-format.c:1372
 #, fuzzy, c-format
 msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
 msgstr "Εσωτερικό σφάλμα: uid σε μή έγκυρη μορφή: %s"
@@ -13288,6 +13383,25 @@ msgstr "Εσωτερικό σφάλμα: uid σε μή έγκυρη μορφή:
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ενσωματωμένος)"
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Κάθε χρόνο"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Κάθε εβδομάδα"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "κάθε  μήνα"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13300,22 +13414,22 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το Evolution να εισάγει τους φακέλους σας..."
 
-#: 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 "Αποτυχία εισαγωγής 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 "Αποτυχία εισαγωγής 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 "Αποτυχία δημιουργίας καταλόγου `%s': %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Αποτυχία ανοίγματος αποθηκευτικού χώρου για `%s': %s"
@@ -13354,34 +13468,34 @@ msgstr "Προσ_ήκη στο Βιβλίο Διευθύνσεων"
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %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 ""
 "Αυτός ο αποθηκευτικός χώρος δεν υποστηρίζει συνδρομές, ή δεν είναι "
 "ενεργοποιημένες."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Συνδρομή"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Φάκελος"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Παρακαλώ επιλέξτε διακομιστή."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Δεν έχει επιλεγεί διακομιστής"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13390,25 +13504,25 @@ msgstr ""
 "Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "--------Προωθημένο Μήνυμα --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "ένας άγνωστος αποστολέας"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Στις  %d-%m-%Y, ημέρα %a, και ώρα %H:%M %%+05d, ο/η %%s έγραψε:"
 
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13417,7 +13531,7 @@ msgstr ""
 "Αδυναμία αποθήκευσης σε `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13426,35 +13540,35 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "μήνυμα"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Σφάλμα:Το '%s' υπάρχει και δεν είναι κανονικό αρχείο"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Αποθήκευση μηνύματος..."
 
-#: mail/em-utils.c:1624
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Προσθήκη διεύθυνσης"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2058
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Μήνυμα από τον/την %s"
 
-#: mail/em-utils.c:2109
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
 
-#: mail/em-utils.c:2440
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13468,7 +13582,7 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: mail/em-utils.c:2465
+#: 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"
@@ -13537,48 +13651,59 @@ msgid "Default height of the Message Window"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου μηνύματος"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Προεπιλεγμένο πλάτος παραθύρου μηνύματος"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Προεπιλεγμένο στυλ απάντησης"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου σύνταξης"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου μυνήματος"
 
-#: 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 "Προκαθορισμένο πλάτος του παραθύρου μυνήματος"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Σχεδίαση σημάνσεων ορθογραφικών σφαλμάτων καθώς πληκτρολογείτε."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Άδειασμα Φακέλων Απορριμάτων στην έξοδο "
 
-#: 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 "Άδειασμα όλων των φακέλων  Απορριμάτων κατά την έξοδο από το  Evolution."
+msgstr ""
+"Άδειασμα όλων των φακέλων  Απορριμάτων κατά την έξοδο από το  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 ""
 "Ενεργοποίηση λειτουργίας caret, έτσι ώστε να βλέπετε ένα δρομέα κατά την "
 "ανάγνωση της αλληλογραφίας."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Ενεργοποίηση/απενεργοποίηση λειτουργίας caret"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Ύψος του ταμπλώ της λίστας μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Ύψος του ταμπλώ της λίστας μηνυμάτων."
 
-#: 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 "
@@ -13588,25 +13713,29 @@ msgstr ""
 "μέσα στο Evolution, οποιοιδήποτε τύποι mime που είναι σε αυτήν την λίστα θα "
 "χρησιμοποιούνται για εμφάνιση."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "Λίστα από Ετικέτες και από τα συσχετιζόμενα χρώματα τους"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Λίστα λογαριασμών"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Λίστα λογαριασμών"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "Λίστα προσαρμοσμένων κεφαλίδων και αν θα είναι ενεργοποιημένες."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
@@ -13614,15 +13743,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 "Λίστα τύπων mime για έλεγχο για εφαρμογές προβολής συστατικού bonobo"
 
-#: 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 "Φόρτωση εικόνων για μηνύματα HTML σε 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 - "
@@ -13633,79 +13762,89 @@ msgstr ""
 "αποστολέας είναι στο βιβλίο διευθύνσεων  2 - Να φορτώνονται πάντοτε εικόνες "
 "από το δίκτυο"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Καταγραφή ενεργειών φίλτρων"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "Καταγραφή ενεργειών φίλτρων στο καθορισμένο αρχείο καταγραφής."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Προεπιλεγμένο ύψος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Προεπιλεγμένο πλάτος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
-msgstr "Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
+msgstr ""
+"Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "Αρχείο ήχου ειδοποίησης Νέου Μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Τύπος ειδοποίησης νέου μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Ειδοποίηση σε κενό θέμα"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να κάνει εκκαθάριση ενός φακέλου."
 
-#: mail/evolution-mail.schemas.in.in.h:49
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς θέμα."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Ειδοποίηση όταν ο χρήστης κάνει εκκαθάριση"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Ειδοποίηση όταν ο χρήστης συμπληρώνει μόνο το πεδίο Κρυφ.Κοιν"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13713,93 +13852,110 @@ msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει HTML σε επαφές που δεν "
 "επιθυμούν αλληλογραφία σε HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς παραλήπτες "
 "στο Πρός ή στο Κοινοποίηση."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ανεπιθύμητο 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 "Αναγνώριση δεσμών στο κείμενο και αντικατάσταση τους."
 
-#: 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 "Αναγνώριση smileys στο κείμενο και αντικατάσταση τους με εικόνες."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
-msgstr "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
+msgstr ""
+"Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
 
-#: 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 "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Εμφάνιση Κινούμενων Εικόνων"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Εμφάνιση κινούμενων εικόνων ως κινούμενα σχέδια."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στην λίστα μηνυμάτων."
+msgstr ""
+"Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στην λίστα μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "Εμφάνιση διαγραμμένων μηνυμάτων στην λίστα μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Προβολή του ταμπλώ \"Προπεπισκόπηση\""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Προβολή του ταμπλώ \"Προπεπισκόπηση\"."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Αρχείο για αναπαραγωγή ήχου κατά την άφιξη νέου μηνύματος."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
+msgstr ""
+"Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Έλεγχος ορθογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Προεπιλεγμένο ύψος του παραθύρου μυνήματος"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Προεπιλεγμένο πλάτος του παραθύρου μυνήματος"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Γραμματοσειρά τερματικού"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "Η γραμματοσειρά τερματικού για για εμφάνιση αλληλογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "Η γραμματοσειρά μεταβλητού πλάτους για εμφάνιση αλληλογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13811,99 +13967,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 "Αλληλουχία λίστας μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Αλληλουχία λίστας μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "Αλληλουχία λίστας μηνυμάτων κατά Θέμα"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Λήξη χρόνου για σημείωση μηνυμάτων ως ανοιγμένα"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Λήξη χρόνου για σημείωση μηνυμάτων ως ανοιγμένα."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Αλφαριθμητικό UID του προεπιλεγμένου λογαριασμού."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Χρήση δαίμονα και πελάτη  Spamasssassin"
 
-#: 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 "Χρήση δαίμονα και πελάτη Spamasssassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Χρήση προσαρμοσμένης γραμματοσειράς"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Χρήση προσαρμοσμένης γραμματοσειράς για την εμφάνιση αλληλογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Χρήση μόνο τοπικών δοκιμών spam."
 
-#: 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 "Χρήση μόνο των τοπικών δοκιμών spam (όχι DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Γραμματοσειρά μεταβλητού πλάτους"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κρυφ.Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κρυφ.Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Από"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Από."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Αποστολή σε"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Αποστολή σε."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Απάντηση σε"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Απάντηση σε."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13911,11 +14067,11 @@ msgstr ""
 "Αν θα γίνεται επαναφορά ή όχι σε αλληλουχία θεμάτων όταν τα μηνύματα δεν "
 "περιέχουν κεφαλίδες Σε απάντηση ή Αναφορές."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "θύρα για έναρξη spamd εκτελεσμένου από χρήστη"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "θύρα spamd"
 
@@ -13954,14 +14110,14 @@ msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
@@ -14006,12 +14162,12 @@ msgstr "Γίνεται Εισαγωγή mailbox"
 msgid "Scanning %s"
 msgstr "Γίνεται σάρωση του %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Φίλτρο Προτεραιότητας \"%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"
@@ -14038,7 +14194,7 @@ msgstr ""
 "εισηγμένα\n"
 "φίλτρα για να δείτε αν όλα λειτουργούν όπως πρέπει."
 
-#: 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"
@@ -14050,7 +14206,7 @@ msgstr ""
 "τα οποία δεν υποστηρίζονται από το Evolution.\n"
 "Αυτά τα φίλτρα δεν θα χρησιμοποιηθούν."
 
-#: 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"
@@ -14064,23 +14220,23 @@ msgstr ""
 "τροποποιήθηκαν ώστε να αναζητούν αν το αλφαριθμητικό είναι\n"
 "ή δεν είναι στο σώμα του μηνύματος."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Εισαγωγή δεδομένων Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14112,62 +14268,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Τρέχον φορμά αποθήκευσης:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Περιεχόμενα Σώματος"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Νέο φορμά αποθήκευσης:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Σημ: Όταν γίνεται μετατροπή μεταξύ φορμά mailbox, ένα σφάλμα\n"
-"(όπως η έλλειψη χώρου στο δίσκο) μπορεί να μην ανακτηθεί αυτόματα.\n"
-"Παρακαλώ κάντε χρήση αυτής της δυνατότητας με μεγάλη προσοχή."
-
-#: 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 "Δεν έχετε συμπληρώσει όλα τις απαιτούμενες πληροφορίες."
 
 #. 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"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Θέση:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λογαριασμούς με το ίδιο όνομα."
 
@@ -14200,11 +14322,11 @@ msgstr "Απαντήσεις σε %s"
 msgid "Add Filter Rule"
 msgstr "Προσθήκη Κανόνα Φίλτρου"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Οι ακόλουθοι κανόνες φίλτρων:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14221,42 +14343,42 @@ msgstr ""
 "Υπάρχουν μη απεσταλμένα μηνύματα, θέλετε να τερματίσετε την εφαρμογή "
 "οπωσδήποτε?"
 
-#: mail/mail-component.c:578
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/mail-component.c:579
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/mail-component.c:580
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/mail-component.c:585
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/mail-component.c:586
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: mail/mail-component.c:587
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Δημιουργία νέου ημερολογίου"
 
-#: mail/mail-component.c:751
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr "Το URI  της πηγής αλληλογραφίας που θα εμφανίσει η προβολή"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14267,11 +14389,12 @@ msgstr ""
 "συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν "
 "στέλνετε μηνύματα."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Λήψη Μηνυμάτων"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14280,15 +14403,15 @@ msgstr ""
 "δεν είστε βέβαιοι, ρωτήστε τον διαχειριστή δικτύου σας ή τον Πάροχο "
 "Υπηρεσιών Διαδικτύου."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Αποστολή Αλληλογραφίας"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14297,11 +14420,11 @@ msgstr ""
 "μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
 "Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Διαχείριση Λογαριασμού"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14315,129 +14438,262 @@ msgstr ""
 "ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
 "όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Γίνεται Έλεγχος Υπηρεσίας"
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr "Σύνδεση στο διακομιστή..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Προεπισκόπηση"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Κατάσταση:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Κατάσταση:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>_Προβαλλόμενες κεφαλίδες μηνύματος</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
-"Να γίνεται πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
-"κρυπτογραφημένων μηνυμάτων"
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Επεξεργαστής Λογαριασμού"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Πληροφορίες Λογαριασμού"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Έλεγχος για Νέα Μηνύματα"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Προσθήκη _Δέσμης Ενεργειών"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Προσθήκη νέας υπογραφής..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
+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>_Προβαλλόμενες κεφαλίδες μηνύματος</b>"
+
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+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 "Ειδοποίηση Νέου Μηνύματος"
+
+#: 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 "Απεσταλμένα και Πρόχειρα Μηνύματα"
+
+#: 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 ""
+"Να γίνεται πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
+"κρυπτογραφημένων μηνυμάτων"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Επεξεργαστής Λογαριασμού"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Προσθήκη νέας υπογραφής..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Προσθήκη _Δέσμης Ενεργειών"
+
+#: mail/mail-config.glade.h:38
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Πάντοτε _κρυφή κοινοποίηση (Bcc) σε:"
 
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Να _υπογράφονται πάντα τα μηνύματα στη χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την "
 "κρυπτογράφηση"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: 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 "Συννημένο"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Πιστοποίηση"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Αυτόματος έλεγχος για νέα μηνύματα κάθε"
+
+#: 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 "_Ήχος κατά την άφιξη νέου μηνύματος"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Κωδικοποίηση  _Χαρακτήρων:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "Χ_ρώματα"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Έλεγχος ε_ισερχόμενης αλληλογραφίας"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Έλεγχος αλληλογραφίας κατά την πληκ_τρολόγηση"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Έλεγχος για Νέα Μηνύματα"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ελέγχει την εισερχόμενη αλληλογραφία για ανεπιθύμητη αλληλογραφία"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Χρώμα για ανορ_θόγραφες λέξεις:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Συγγραφή Μηνυμάτων"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "Χ_ρώματα"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Ρυθμίσεις"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Επι_βεβαίωση στην εξάλειψη από ένα φάκελο"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14453,275 +14709,265 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Εφαρμογή\" για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Προκαθορισμένη Συμπεριφορά"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Προεπιλεγμένη κω_δικοποίηση χαρακτήρων:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Διαγραφή Αλληλογραφίας"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Να _υπογράφονται πάντα ψηφιακά τα μηνύματα (προεπιλογή)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "_Προεπιλογή"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Να μην γίνεται παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
+msgstr ""
+"Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
 
-#: 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 "Τέλος"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Φάκελος προχείρων:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Λογαριασμοί Email"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "Διεύ_θυνση Email:"
 
-#: 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 "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Πιστοποιητικό κρ_υπτογράφησης:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Βοηθός Λογαριασμού Evolution"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Εκτέλεση Εντολής..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Στα_θερού πλάτους:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Επιλογές Φίλτρων"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Ιδιότητες Γραμματοσειράς"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Μορφοποίηση μηνυμάτων σε _HTML"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "Αλληλογραφία _HTML"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Κε_φαλίδες"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Επισήμανση παρα_θέσεων με"
 
-#: 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 "Μέσα στο μήνυμα"
 
-#: 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 "Ετικέτες και Χρώματα"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Φόρτωση Εικόνων"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Ρυθμίσεις Ταχυδρομείου"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Θέση Mailbox"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Επεξεργαστής Μηνύματος"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Προβολή Μηνύματος"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Γραμματοσειρές Μηνυμάτων"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Ειδοποίηση Νέου Μηνύματος"
-
-#: 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"
-msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
-
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Προαιρετικές Πληροφορίες"
+msgstr ""
+"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Ορ_γανισμός:"
 
-#: 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 "Διαλέξτε χρώμα"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
 "κρυφή _κοινοποίηση (Bcc)"
 
-#: 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 "Εκτυπωμένες Γραμματοσειρές"
-
-#: 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 "Παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Με παράθεση"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "_Απομνημόνευση αυτού του κωδικού πρόσβασης"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Απομνημόνευση κωδικού"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Α_πάντηση Σε:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Γίνεται Λήψη Μηνύματος"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Επιλ_ογές Λήψης"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Απομνημόνευση του κωδικού _πρόσβασης"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Απαιτούμενες Πληροφορίες"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Επαναφορά Προεπιλογών"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Απομνημόνευση κωδικού"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "Ασφάλ_εια"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Κανονική γραμματοσειρά:"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Ασφαλές MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Ασφάλεια"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους "
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους "
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Επιλο_γή..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Αποστέλλονται τα μηνύματα"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Φάκελος _απεσταλμένων μηνυμάτων:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Ο _διακομιστής απαιτεί πιστοποίηση"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Ρυθμίσεις Διακομιστή"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Είδος _Διακομιστή: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "Πιστοποίητικό υπογρα_φής:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Υπογραφή:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Υπογραφές"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Ορισμός όνοματος αρ_χείου:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "Έλεγχος Ορ_θογραφίας"
 
-#: 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 "Γραμματοσειρά _Τερματικού:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Τύπος:"
+
+#: 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"
@@ -14731,7 +14977,7 @@ msgstr ""
 "η υπογραφή σας. Το όνομα που θα καθορίσετε θα χρησιμοποιηθεί\n"
 "μόνο για την εμφάνιση."
 
-#: 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 "
@@ -14741,7 +14987,7 @@ msgstr ""
 "ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
 "γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
-#: 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\""
@@ -14749,15 +14995,15 @@ msgstr ""
 "Πληκτρολογήστε το όνομα με το οποίο θα αναφέρεστε για τον λογαριασμό.\n"
 "Για παράδειγμα: \"Work\" or \"Personal\" "
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Χρήση _Δαίμονα"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Μετ_αβλητού πλάτους:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14767,167 +15013,100 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Επόμενο\" για να ξεκινήσετε.. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Προσθήκη υπογραφής"
 
-#: 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 "Να γίνεται _πάντα φόρτωμα των εικόνων από το δικτύου"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Να _υπογράφονται πάντα τα μηνύματα στη χρήση αυτού του λογαριασμού"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "Τύπος _Πιστοποίησης: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "Τύπος _Πιστοποίησης: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "_Αυτόματος έλεγχος για νέα μηνύματα κάθε"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Ήχος κατά την άφιξη νέου μηνύματος"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "Επι_βεβαίωση στην εξάλειψη από ένα φάκελο"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Προεπιλεγμένη  Υπογραφή:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Προεπιλογή"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Να _υπογράφονται πάντα ψηφιακά τα μηνύματα (προεπιλογή)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Κρυπτογράφηση εξερχόμενης αλληλογραφίας (προεπιλογή)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr " Στυλ προώ_θησης:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "Π_λήρες Όνομα:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "Αλληλογραφία _HTML"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "Τα_υτότητα"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "Ανεπι_θύμητη αλληλογραφία"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "_Φόρτωση εικόνων αν ο αποστολέας υπάρχει στο βιβλίο διευθύνσεων"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "_Τοπικές δοκιμές μόνο"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "Αυτός είναι ο _προεπιλεγμένος λογαριασμός"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: 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 "_Να μην φορτώνονται ποτέ εικόνες από το δίκτυο"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
-
-#: 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 "Ερώ_τηση στην αποστολή μηνυμάτων HTML σε επαφές που δεν το θέλουν"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ε_ρώτηση στην αποστολή μηνυμάτων με άδειο θέμα"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Λήψη Μηνυμάτων"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "Στυλ α_πάντησης:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Επαναφορά προεπιλογών"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Δέσμη ενεργειών:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "Επιλο_γή..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "Απο_στολή Αλληλογραφίας"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Εμφάνι_ση κινούμενων εικόνων"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Υπογραφές"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Κανονική γραμματοσειρά:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "Γραμματοσειρά _Τερματικού:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Χρήση των ίδιων γραμματοσειρών με τις άλλες εφαρμογές"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "λεπτό(ά)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr " χρώμα"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "Περιγραφή"
 
@@ -14936,7 +15115,7 @@ msgstr "Περιγραφή"
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14945,7 +15124,7 @@ msgstr ""
 "Σφάλμα κατά '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14954,7 +15133,7 @@ msgstr ""
 "Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Εργάζεται"
 
@@ -15075,16 +15254,20 @@ msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
 #: mail/mail-ops.c:1838
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Παραλαμβάνονται %d μήνυμα(τα)"
+msgstr[1] "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1922
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Αποθήκευση %d μηνυμάτων"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Αποθήκευση %d μηνυμάτων"
+msgstr[1] "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15093,7 +15276,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15102,11 +15285,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15115,17 +15298,17 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου αποτελέσματος: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
@@ -15142,84 +15325,81 @@ msgstr "Εύρεση στο Μήνυμα"
 msgid "Find:"
 msgstr "Εύρεση:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Αναζήτηση"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Ψηφιακή υπογραφή"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Κρυπτοφράφηση"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "Πληροφορίες ασφάλειας"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Διακομιστής: %s, Είδος: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Θέση: %s, Τύπος: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Αποστολή & Λήψη Μηνυμάτων"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Ακύρωση _Όλων"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Ανανέωση..."
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε Κωδικό Πρόσβασης για %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Εισάγετε Κωδικό Πρόσβασης"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
-msgstr "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %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"
@@ -15229,23 +15409,23 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "Α_πόρριψη αλλαγών"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Αποθήκευση υπογραφής"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Επεξεργασία υπογραφής"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Εισάγετε ένα όνομα για αυτήν την υπογραφή."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -15273,17 +15453,17 @@ msgstr "Προωθημένο μήνυμα"
 msgid "Invalid folder: `%s'"
 msgstr "Μη έγκυρος φάκελος: `%s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ρύθμιση εφακέλου: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15296,84 +15476,84 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Προσπάθεια επεξεργασίας εφακέλου '%s' που δεν υπάρχει."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Μη ανοιγμένα"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Ανοιγμένα"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Πολλαπλά μή ανοιγμένα μηνύματα"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr ";"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: 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 "Δημιουργία λίστας μηνυμάτων"
 
@@ -15458,7 +15638,8 @@ msgstr ""
 "Παρακαλώ επιλέξτε μια ενέργεια παρακολούθησης από το μενού \"Σημαία\"."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Λήξη:"
 
 #: mail/message-tags.glade.h:7
@@ -15527,7 +15708,8 @@ msgstr "'Εκδοση ρυθμίσεων του Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
+msgstr ""
+"ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
@@ -15546,7 +15728,8 @@ msgstr ""
 "ανάπτυξη εκδόσεις του Evolution."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Λίστα από διαδρομέα για τους φακέλους που θα συγχρονίζονται στον δίσκο για "
 "εργασία χωρίς σύνδεση"
@@ -15667,7 +15850,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Επιλέξτε τον προορισμό για αυτή την εισαγωγή"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr "Παρακαλώ επιλέξτε την πληροφορία που θέλετε να εισάγετε:"
 
@@ -15696,26 +15879,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Επιλογή εισαγωγής"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr "Το αρχείο %s δεν υπάρχει"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Εισάγεται"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Εισάγεται %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 "Σφάλμα κατά το φόρτωμα του %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15724,31 +15907,31 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "Όνομα Αρ_χείου:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Επιλέξτε ένα αρχείο"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Τύπος αρχείου:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από πα_λαιότερα προγράμματα"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Εισαγωγή μο_ναδικού αρχείου"
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15756,25 +15939,25 @@ msgstr ""
 "Παρακαλώ περιμένετε...\n"
 "Γίνεται σάρωση για υπάρχουσες εγκαταστάσεις"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "Από %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Δεν υπάρχει διαθέσιμος εισαγωγέας για το αρχείο %s"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "Αποτυχία εκτέλεσης εισαγωγέα"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "Ε_ισαγωγή"
 
@@ -15782,7 +15965,7 @@ msgstr "Ε_ισαγωγή"
 msgid "Closing connections..."
 msgstr "Κλείσιμο συνδέσεων..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Ρυθμίσεις Evolution "
 
@@ -15816,11 +15999,11 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστο�
 msgid "Cannot find the specified shared folder."
 msgstr "Δεν ήταν δυνατή η εύρεση του συγκεκριμένου κοινόχρηστου φακέλου."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Εκκίνηση εισαγωγής"
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15890,7 +16073,8 @@ msgid "Work Offline"
 msgstr "Εργασία Εκτός Δικτύου"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
 "να αποσυνδεθείτε."
@@ -15900,7 +16084,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Το Ximian Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
 "συνδεθείτε."
@@ -15939,7 +16124,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 "Νέο"
 
@@ -15993,19 +16177,20 @@ msgid "Create a new test item"
 msgstr "Δημιουργία νέου αντικείμενου δοκιμής"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Ενεργές Συνδέσεις"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Ενεργές Συνδέσεις"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός "
 "δικτύου"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Οι παρακάτω συνδέσεις είναι ενεργές αυτή τη στιγμή:"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "Η_μερολόγιο:"
@@ -16124,28 +16309,29 @@ msgstr ""
 "Ο βοηθός θα σας καθοδηγήσει στη διαδικασία εισαγωγής δεδομένων\n"
 "στο Evolution από εξωτερικά αρχεία."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Εισαγωγείς"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Όχι εισαγωγή"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
-msgstr "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
+msgstr ""
+"Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
 #. 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"
@@ -16180,7 +16366,7 @@ msgstr ""
 "Ελπίζουμε τα απολαύσετε τα αποτελέσματα της σκληρής μας δουλειάς\n"
 "και περιμένουμε με ανυπομονησία την συμβολή σας!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16188,48 +16374,50 @@ msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Ximian Evolution\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλον του Ximian Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
+msgstr ""
+"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Εκκίνηση του Evolution  με ενεργοποίηση του καθορισμένου συστατικού"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Βιαίο κλείσιμο όλων των συστατικών του evolution"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Βιαία επαναεισαγωγή από το Evolution 1.4"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
-msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr ""
+"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: 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"
@@ -16238,30 +16426,30 @@ msgstr ""
 "%s: --online and --offline δεν μπορούν να χρησιμοποιηθούν μαζί.\n"
 " Χρησιμοποιήστε %s --help για περισσότερες πληροφορίες.\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 "Επιλογή ενός πιστοποιητικού για εισαγωγή..."
 
-#: 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 "Όνομα Πιστοποιητικού"
 
-#: 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 "Σκοποί"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Σειριακός Αριθμός"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Λήγει"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "Διεύθυνση E-Mail "
 
@@ -16270,11 +16458,22 @@ msgstr "Διεύθυνση E-Mail "
 msgid "Certificate Viewer: %s"
 msgstr "Εφαρμογή Προβολής Πιστοποιητικού: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Εισάγετε κωδικό πρόσβασης για %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Εισάγετε κωδικό"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16324,7 +16523,8 @@ msgstr "<b>Εκδόθηκε Σε</b>"
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί  για τις ακόλουθες χρήσεις</b>"
+msgstr ""
+"<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί  για τις ακόλουθες χρήσεις</b>"
 
 #: smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -16452,20 +16652,23 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Έχετε πιστοποιητικά από οργανισμούς που πιστοποιούν εσάς:"
 
 #: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τις παρακάτω αρχές "
 "πιστοποίησης:"
 
 #: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
+msgstr ""
+"Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
 
 #: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Τα Πιστοποιητικά σας:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr "Το πιστοποιητικό υπάρχει ήδη"
 
@@ -16736,7 +16939,7 @@ msgstr "Μετακίνηση επαφών σε άλλο φάκελο..."
 msgid "Move to Folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Επικόλληση του προχείρου"
 
@@ -16746,7 +16949,7 @@ msgstr "Προεπισκόπηση των επαφών προς εκτύπωση
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Προεπισκόπηση Εκτύπωσης"
 
@@ -16794,13 +16997,13 @@ msgstr "Τερματισμός Φόρτωσης"
 msgid "View the current contact"
 msgstr "Προβολή της τρέχουσας επαφής"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h: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 "Ε_νέργειες"
 
@@ -16821,14 +17024,10 @@ msgid "_Save as VCard"
 msgstr "_Αποθήκευση ως VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Αναζήτηση Επαφής"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Επιλογή Όλων"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Απο_στολή Μηνύματος σε Επαφή..."
 
@@ -16836,58 +17035,54 @@ msgstr "Απο_στολή Μηνύματος σε Επαφή..."
 msgid "Day"
 msgstr "Ημέρα"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Διαγραφή Όλων των Εμφανίσεων"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Διαγραφή του ραντεβού"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Διαγραφή αυτής της Εμφάνισης"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Διαγραφή αυτής της Εμφάνισης"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Μετάβαση Στο"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Μετάβαση Πίσω"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Μετάβαση Μπροστά"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Μετάβαση σε _Ημερομηνία"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Μετάβαση σε συγκεκριμένη ημερομηνία"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Μετάβαση στο σήμερα"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Λίστα"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Μήνας"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Επόμενο"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Προεπισκόπηση του ημερολογίου προς εκτύπωση"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Προηγούμενο"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Εκτύπωση αυτού του ημερολογίου"
@@ -16896,7 +17091,7 @@ msgstr "Εκτύπωση αυτού του ημερολογίου"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Δημοσίευση πληροφοριών Διαθεσιμότητας για αυτό το ημερολόγιο"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Εκκα_θάριση"
 
@@ -16905,34 +17100,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Εκκαθάριση παλαιών ραντεβού και συναντήσεων"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Επιλογή όλου του κειμένου"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Μετάβαση σε συγκεκριμένη ημερομηνία"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Επιλογή Φακέλου"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Εμφάνιση ως λίστα"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Εμφάνιση μίας ημέρας"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Εμφάνιση ένας μήνα"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Εμφάνιση μίας εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Εμφάνιση της εργάσιμης εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Σήμερα"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Προβολή του τρέχοντος ραντεβού"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "Άν_οιγμα ραντεβού"
 
@@ -17126,7 +17341,8 @@ msgstr "Άνοιγμα παραθύρου για την σύνθεση νέου
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr ""
+"Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -17146,7 +17362,8 @@ msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
+msgstr ""
+"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
@@ -17185,7 +17402,8 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
 "γραμμή στη μέση"
@@ -17204,7 +17422,8 @@ msgstr "Επικόλληση μηνύματος από το πρόχειρο"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
+msgstr ""
+"Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -17300,11 +17519,13 @@ msgstr "Δημιουργία κανόνα για το φιλτράρισμα μ�
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
@@ -17472,10 +17693,6 @@ msgstr "Μετακίνηση"
 msgid "Move selected message(s) to another folder"
 msgstr "Μετακίνηση επιλεγμένων μηνυμάτων σε άλλο φάκελο"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Επόμενο"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Επόμενο Σ_ημαντικό Μήνυμα"
@@ -17524,10 +17741,6 @@ msgstr "Πρ_οηγούμενο Σημαντικό Μήνυμα"
 msgid "Preview the message to be printed"
 msgstr "Προεπισκόπηση του μηνύματος προς εκτύπωση"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Προηγούμενο"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Εκτύπωση μηνύματος"
@@ -17708,7 +17921,8 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr ""
+"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
@@ -17938,39 +18152,39 @@ msgstr "Αντιγραφή επιλεγμένης εργασίας"
 msgid "Cut selected task"
 msgstr "Αποκοπή επιλεγμένης εργασίας"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Διαγραφή ολοκληρωμένων εργασιών"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Διαγραφή επιλεγμένων εργασιών"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Επικόλληση εργασίας από το πρόχειρο"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Προεπισκόπηση της λίστας εργασιών προς εκτύπωση"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Εκτύπωση της λίστας εργασιών"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Προβολή της επιλεγμένης εργασίας"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "Ά_νοιγμα εργασίας"
 
@@ -18101,10 +18315,15 @@ msgid "_Day View"
 msgstr "Προβολή Η_μέρας"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Προβολή λίστας"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Προβολή _Μήνα"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Προ_βολή Εργάσιμων Ημερών"
 
@@ -18133,10 +18352,16 @@ msgid "_Messages"
 msgstr "_Μηνύματα"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Με _Κατηγορία"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Ημερομηνία Λήξης:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Ορισμός Κατάστασης"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Εργασίες"
 
@@ -18199,10 +18424,6 @@ msgstr "%B %Y"
 msgid "Now"
 msgstr "Τώρα"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Σήμερα"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18212,82 +18433,87 @@ msgstr "Ο χρόνος πρέπει να έχει την μορφή: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Η ποσοστιαία μονάδα πρέπει να είναι μεταξύ 0 και 100, υποχρεωτικά"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Βαλτικά"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Κεντρικής Ευρώπης"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Κινέζικα"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Κυριλλικά"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Εβραϊκά"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Γιαπωνέζικα"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Κορεάτικα"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Τουρκικά"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Δυτικής Ευρώπης"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "Δυτικής Ευρώπης"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Παραδοσιακά"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "Απλοποιημένα"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ουκρανικά"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Οπτική"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Άγνωστο σύνολο χαρακτήρων: %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 "Κωδικοποίηση Χαρακτήρων"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Εισάγετε την κωδικοποίηση προς χρήση"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Άλλο..."
 
@@ -18353,6 +18579,11 @@ msgstr "Διάστιχο σήμανσης"
 msgid "Spacing around expander arrow"
 msgstr "Διάστιχο γύρω από το βέλος expander"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "Ανα_ζήτηση"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Επεξεργαστής Αναζήτησης"
@@ -18416,14 +18647,265 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Επιλογή προορισμού %s"
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Πηγές βιβλίου διευθύνσεων"
+
+#~ msgid "Selected:"
+#~ msgstr "Επιλεγμένα:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 Επαφή"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "και %d άλλες επαφές."
+
+#~ msgid "1 day"
+#~ msgstr "1 ημέρα"
+
+#~ msgid "1 week"
+#~ msgstr "1 εβδομάδα"
+
+#~ msgid "1 hour"
+#~ msgstr "1 ώρα"
+
+#~ msgid "1 minute"
+#~ msgstr "1 λεπτό"
+
+#~ msgid "1 second"
+#~ msgstr "1 δευτερόλεπτο"
+
+#~ msgid "Description"
+#~ msgstr "Περιγραφή"
+
+#~ msgid "component"
+#~ msgstr "στοιχείο"
+
+#~ msgid "Alarms"
+#~ msgstr "Ειδοποιήσεις"
+
+#, fuzzy
+#~ msgid "Geographical position"
+#~ msgstr "Γεωγραφική Θέση"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Κάθε %d ημέρες"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Κάθε %d εβδομάδες"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Κάθε %d εβδομάδες σε"
+
+#~ msgid "every %d months"
+#~ msgstr "κάθε %d μήνες"
+
+#~ msgid "Every %d years"
+#~ msgstr "Κάθε %d χρόνια"
+
+#~ msgid "Go To Date"
+#~ msgstr "Πήγαινε στην Ημερομηνία"
+
+#~ msgid "_Go To Today"
+#~ msgstr "_Πήγαινε στο Σήμερα"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Όνομα Διακομιστή LDAP:"
+
+#~ msgid "Search base:"
+#~ msgstr "Βάση  αναζήτησης:"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d δευτερόλεπτα πριν"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d λεπτά πριν"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d ώρες πριν"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d ημέρες πριν"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d εβδομάδες πριν"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d μήνες πριν"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d έτη πριν"
+
+#, fuzzy
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "Κανόνες Φίλτρων"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Επεξεργασία Φίλτρων"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Επεξεργασία ΕΦακέλων"
+
+#~ msgid "Outgoing"
+#~ msgstr "Εξερχόμενα"
 
-#~ msgid "calendar"
-#~ msgstr "ημερολόγιο"
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
 
-#~ msgid "task list"
-#~ msgstr "λίστα εργασιών"
+#~ msgid "Shell Command"
+#~ msgstr "Εντολή Κέλυφους"
+
+#~ msgid "[script]"
+#~ msgstr "[δέσμη ενεργειών]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
+
+#~ msgid "Current store format:"
+#~ msgstr "Τρέχον φορμά αποθήκευσης:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Περιεχόμενα Σώματος"
+
+#~ msgid "New store format:"
+#~ msgstr "Νέο φορμά αποθήκευσης:"
+
+#~ 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 ""
+#~ "Σημ: Όταν γίνεται μετατροπή μεταξύ φορμά mailbox, ένα σφάλμα\n"
+#~ "(όπως η έλλειψη χώρου στο δίσκο) μπορεί να μην ανακτηθεί αυτόματα.\n"
+#~ "Παρακαλώ κάντε χρήση αυτής της δυνατότητας με μεγάλη προσοχή."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Πληροφορίες Λογαριασμού"
+
+#~ msgid "Authentication"
+#~ msgstr "Πιστοποίηση"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Συγγραφή Μηνυμάτων"
+
+#~ msgid "Configuration"
+#~ msgstr "Ρυθμίσεις"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Προκαθορισμένη Συμπεριφορά"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Διαγραφή Αλληλογραφίας"
+
+#~ msgid "Filter Options"
+#~ msgstr "Επιλογές Φίλτρων"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Ετικέτες και Χρώματα"
+
+#~ msgid "Loading Images"
+#~ msgstr "Φόρτωση Εικόνων"
+
+#~ msgid "Message Display"
+#~ msgstr "Προβολή Μηνύματος"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Γραμματοσειρές Μηνυμάτων"
+
+#~ msgid "Optional Information"
+#~ msgstr "Προαιρετικές Πληροφορίες"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Εκτυπωμένες Γραμματοσειρές"
+
+#~ msgid "Re_member this password"
+#~ msgstr "_Απομνημόνευση αυτού του κωδικού πρόσβασης"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Απομνημόνευση του κωδικού _πρόσβασης"
+
+#~ msgid "Required Information"
+#~ msgstr "Απαιτούμενες Πληροφορίες"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Επαναφορά Προεπιλογών"
+
+#~ msgid "S_ecurity"
+#~ msgstr "Ασφάλ_εια"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Ασφαλές MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Ρυθμίσεις Διακομιστή"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "Τύπος _Πιστοποίησης: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "Τύπος _Πιστοποίησης: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Προεπιλεγμένη  Υπογραφή:"
+
+#~ msgid "_Full name:"
+#~ msgstr "Π_λήρες Όνομα:"
+
+#~ msgid "_Identity"
+#~ msgstr "Τα_υτότητα"
+
+#~ msgid "_Junk"
+#~ msgstr "Ανεπι_θύμητη αλληλογραφία"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Λήψη Μηνυμάτων"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Επαναφορά προεπιλογών"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "Απο_στολή Αλληλογραφίας"
+
+#~ msgid "Search"
+#~ msgstr "Αναζήτηση"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Ψηφιακή υπογραφή"
+
+#~ msgid "Encryption"
+#~ msgstr "Κρυπτοφράφηση"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Οι παρακάτω συνδέσεις είναι ενεργές αυτή τη στιγμή:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Αναζήτηση Επαφής"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Μετάβαση σε _Ημερομηνία"
+
+#~ msgid "Go to today"
+#~ msgstr "Μετάβαση στο σήμερα"
+
+#~ msgid "With _Category"
+#~ msgstr "Με _Κατηγορία"
 
 #~ msgid "Send an Email"
 #~ msgstr "Αποστολή e-mail"
@@ -18801,4 +19283,3 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
 #~ msgid "Evolution is now exiting ..."
 #~ msgstr "Το Evolution τώρα τερματίζεται..."
-
diff --git a/po/en_AU.po b/po/en_AU.po
index cda37fc427..aa0f19209a 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -13,6 +13,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Cannot initialise Evolution's mail component."
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " card"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -94,82 +131,98 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 #, fuzzy
 msgid "_Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 #, fuzzy
 msgid "Create a new contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -194,17 +247,17 @@ msgstr ""
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
 
@@ -249,54 +302,54 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Could not close temporary folder: %s"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr ""
 
@@ -319,16 +372,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -343,62 +390,53 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Organisation"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -406,51 +444,51 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Email address:"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -460,30 +498,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -494,7 +528,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -503,7 +537,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -511,39 +545,39 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -552,7 +586,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -560,7 +594,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -570,7 +604,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -580,41 +614,41 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -622,28 +656,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -651,60 +685,48 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr ""
 
@@ -737,7 +759,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr ""
 
@@ -753,7 +775,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr ""
 
@@ -825,7 +847,8 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr ""
 
@@ -834,7 +857,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
@@ -914,16 +937,27 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr ""
@@ -965,8 +999,8 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 #, fuzzy
 msgid "Address"
 msgstr "Chile"
@@ -974,14 +1008,14 @@ msgstr "Chile"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr ""
 
@@ -1963,9 +1997,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr ""
 
@@ -1979,20 +2013,21 @@ msgid "MSN Messenger"
 msgstr "Can not open message"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Organisation"
@@ -2002,110 +2037,98 @@ msgid "Username"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr ""
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 #, fuzzy
 msgid "Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 #, fuzzy
 msgid "Changed"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2119,6 +2142,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr ""
 
@@ -2126,6 +2150,18 @@ msgstr ""
 msgid "E-_mail:"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
@@ -2229,23 +2265,26 @@ msgid "_Title:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
+msgid "Add IM Account"
 msgstr ""
 
 #: addressbook/gui/contact-editor/im.glade.h:3
-msgid "Add IM Account"
+msgid "_Account name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
 #, fuzzy
-msgid "Location:"
+msgid "_Location:"
 msgstr "Organisation"
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr ""
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr ""
@@ -2266,25 +2305,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2333,24 +2373,21 @@ msgid "No contacts"
 msgstr "_Other Organiser"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "_Other Organiser"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr ""
 
@@ -2362,133 +2399,132 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2497,7 +2533,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
@@ -2531,8 +2567,6 @@ msgid "Car Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
@@ -2541,7 +2575,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr ""
 
@@ -2594,6 +2628,7 @@ msgid "Manager"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr ""
 
@@ -2602,7 +2637,7 @@ msgid "Nickname"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr ""
 
@@ -2611,7 +2646,7 @@ msgid "Office"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2667,17 +2702,17 @@ msgid "Web Site"
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr ""
 
@@ -2721,84 +2756,87 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "Chile"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "Groupwise"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
-msgid "personal"
+#: addressbook/gui/widgets/eab-contact-display.c:319
+msgid "work"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2806,154 +2844,154 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2990,34 +3028,31 @@ msgstr ""
 msgid "Querying Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "_Other Organiser"
+msgid_plural "and %d other contacts."
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr ""
 
@@ -3170,7 +3205,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr ""
 
@@ -3349,7 +3384,7 @@ msgid "Unnamed List"
 msgstr ""
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3432,7 +3467,7 @@ msgid "Evolution's Tasks component"
 msgstr "Cannot initialise Evolution's mail component."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3479,24 +3514,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3505,12 +3540,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3518,7 +3553,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3529,7 +3564,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3696,13 +3731,13 @@ msgstr ""
 msgid "Location contains"
 msgstr "Organisation"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr ""
 
@@ -3718,7 +3753,7 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr ""
 
@@ -3729,7 +3764,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
 
@@ -3751,74 +3786,74 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 #, fuzzy
 msgid "New meeting"
 msgstr "Synchronising folders"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 #, fuzzy
 msgid "M_eeting"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3848,10 +3883,6 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3869,16 +3900,16 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -3942,11 +3973,11 @@ msgstr ""
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr ""
 
@@ -3969,11 +4000,11 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr ""
 
@@ -3981,17 +4012,17 @@ msgstr ""
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr ""
@@ -4022,7 +4053,7 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr ""
 
@@ -4032,8 +4063,8 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr ""
 
@@ -4047,19 +4078,19 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr ""
 
@@ -4083,7 +4114,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Alerts"
 msgstr ""
 
@@ -4108,7 +4139,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
@@ -4205,7 +4236,7 @@ msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr ""
 
@@ -4250,7 +4281,6 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr ""
 
@@ -4341,7 +4371,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "_Other Organiser"
@@ -4483,28 +4513,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr ""
 
@@ -4541,8 +4571,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr ""
 
@@ -4556,35 +4587,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "_Other Organiser"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4614,18 +4630,24 @@ msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
 #, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
 #, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4687,7 +4709,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
@@ -4760,8 +4782,6 @@ msgstr "Organisation"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
@@ -4813,13 +4833,13 @@ msgstr ""
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr ""
 
@@ -4876,13 +4896,13 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
@@ -5056,7 +5076,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr ""
 
@@ -5095,7 +5115,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5103,6 +5123,27 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+msgid "Select source"
+msgstr ""
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr ""
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "_Other Organiser"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
@@ -5132,39 +5173,39 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
@@ -5179,7 +5220,7 @@ msgid "Undefined"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5222,9 +5263,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr ""
 
@@ -5234,12 +5275,14 @@ msgid "Folder:"
 msgstr "Synchronising folder"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr ""
+#, fuzzy
+msgid "Sta_rt date:"
+msgstr "_Other Organiser"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr ""
+#, fuzzy
+msgid "_Due date:"
+msgstr "_Other Organiser"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "Authentication Credentials for HTTP Server"
@@ -5292,136 +5335,111 @@ msgstr ""
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
-msgid "%d days"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:411
+#: calendar/gui/e-alarm-list.c:400
 #, c-format
-msgid "%d hours"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:419
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
-msgid "%d minutes"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr ""
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:427
+#: calendar/gui/e-alarm-list.c:410
 #, c-format
-msgid "%d seconds"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr ""
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr ""
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-#, fuzzy
-msgid "color"
-msgstr "Colours"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr ""
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr ""
@@ -5454,250 +5472,262 @@ msgid ""
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr ""
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
+#: calendar/gui/e-calendar-table.c:413
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
+#: calendar/gui/e-calendar-table.c:414
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
+#: calendar/gui/e-calendar-table.c:415
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
+#: calendar/gui/e-calendar-table.c:416
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
+#: calendar/gui/e-calendar-table.c:417
+msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
+#: calendar/gui/e-calendar-table.c:418
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
+#: calendar/gui/e-calendar-table.c:419
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
+#: calendar/gui/e-calendar-table.c:420
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
+#: calendar/gui/e-calendar-table.c:421
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
+#: calendar/gui/e-calendar-table.c:422
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
+#: calendar/gui/e-calendar-table.c:423
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
+#: calendar/gui/e-calendar-table.c:1041
+msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
-msgid "0%"
+#: calendar/gui/e-calendar-table.c:1053
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
-msgid "10%"
+#: calendar/gui/e-calendar-table.c:1054
+msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
-msgid "20%"
+#: calendar/gui/e-calendar-table.c:1055
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
-msgid "30%"
+#: calendar/gui/e-calendar-table.c:1056
+msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
-msgid "40%"
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:418
-msgid "50%"
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Click to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:419
-msgid "60%"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:420
-msgid "70%"
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:421
-msgid "80%"
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Completion date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:422
-msgid "90%"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-calendar-table.c:423
-msgid "100%"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
-msgid "Open _Web Page"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-calendar-table.c:1050
-msgid "_Assign Task"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1051
-msgid "_Forward as iCalendar"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1052
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1053
-msgid "_Mark Selected Tasks as Complete"
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
-msgid "_Delete Selected Tasks"
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
-msgid "Click to add a task"
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr ""
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Organisation"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
-msgid "Complete"
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Organisation"
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Priority"
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
@@ -5727,26 +5757,26 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr ""
@@ -5755,416 +5785,413 @@ msgstr ""
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, c-format
 msgid "Every day"
-msgstr ""
+msgid_plural "Every %d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, c-format
-msgid "Every %d days"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:611
 msgid "Every week"
-msgstr ""
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, c-format
-msgid "Every %d weeks"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr ""
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, c-format
 msgid "every month"
-msgstr ""
+msgid_plural "every %d months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:648
 #, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
 msgid "Every year"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:930
+#, fuzzy
+msgid "Location:"
+msgstr "Organisation"
+
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6299,7 +6326,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6383,12 +6410,12 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6396,7 +6423,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6404,58 +6431,60 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1751
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
-msgid "Loading tasks at %s"
+msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
-msgid "Loading appointments at %s"
+msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Synchronising folders"
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr ""
 
@@ -6476,44 +6505,46 @@ msgid "February"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
-msgstr ""
+#, fuzzy
+msgid "Select Date"
+msgstr "_Other Organiser"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr ""
+#, fuzzy
+msgid "_Select Today"
+msgstr "Organisation"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6595,7 +6626,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -6752,81 +6783,81 @@ msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr ""
 
@@ -6835,39 +6866,39 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8507,7 +8538,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8515,7 +8546,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8523,7 +8554,7 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr ""
 
@@ -8540,7 +8571,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -8653,31 +8684,35 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 #, fuzzy
 msgid "Copying messages"
 msgstr "Can not open message"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Can not open message"
@@ -8707,7 +8742,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr ""
 
@@ -9064,7 +9100,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9252,7 +9288,7 @@ msgstr ""
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
@@ -9261,21 +9297,22 @@ msgstr "Can not get folder: Invalid operation on this store"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9484,17 +9521,17 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
@@ -9528,51 +9565,51 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
+msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Other Organiser"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9628,14 +9665,14 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9651,25 +9688,25 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9741,18 +9778,18 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9762,14 +9799,14 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -9777,49 +9814,49 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9827,32 +9864,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9883,20 +9921,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Can not open mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -9952,7 +9990,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10001,8 +10039,8 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Could not close temporary folder: %s"
@@ -10032,14 +10070,14 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Can not get folder: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Can not get folder: %s: %s"
@@ -10058,7 +10096,7 @@ msgstr "Can not delete folder: %s: Invalid operation"
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -10067,28 +10105,28 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Can not open maildir directory path: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10136,7 +10174,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Can not create folder lock on %s: %s"
@@ -10165,30 +10203,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not close temporary folder: %s"
@@ -10232,7 +10270,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -10275,12 +10313,12 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Can not get folder: %s: %s"
@@ -10550,46 +10588,46 @@ msgstr "Can not create folder lock on %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10636,7 +10674,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr ""
 
@@ -10716,7 +10754,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr ""
 
@@ -10768,12 +10806,12 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -10892,11 +10930,11 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
-msgid "STARTTLS request timed out: %s"
+msgid "STARTTLS command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
+msgid "STARTTLS command failed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
@@ -10928,154 +10966,152 @@ msgid "SMTP mail delivery via %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Can not encrypt this message: no recipients specified"
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, c-format
-msgid "HELO request timed out: %s"
+msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 #, c-format
-msgid "AUTH request timed out: %s"
+msgid "AUTH command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
+msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
 #, c-format
-msgid "DATA request timed out: %s: mail not sent"
+msgid "DATA command failed: %s: mail not sent"
 msgstr ""
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
 #, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
+msgid "RSET command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
+msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, c-format
-msgid "QUIT request timed out: %s"
+msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -11097,19 +11133,19 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr ""
 
@@ -11120,45 +11156,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11167,11 +11203,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr ""
 
@@ -11179,83 +11215,83 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Can not encrypt this message: no plaintext to encrypt"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11264,48 +11300,53 @@ msgid ""
 msgstr ""
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11313,13 +11354,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11435,21 +11476,21 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr ""
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -11532,13 +11573,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr ""
 
@@ -11547,119 +11588,106 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, c-format
 msgid "1 second ago"
-msgstr ""
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, c-format
-msgid "%d seconds ago"
-msgstr ""
-
-#: filter/filter-datespec.c:66
 msgid "1 minute ago"
-msgstr ""
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, c-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: filter/filter-datespec.c:67
 msgid "1 hour ago"
-msgstr ""
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, c-format
-msgid "%d hours ago"
-msgstr ""
-
-#: filter/filter-datespec.c:68
 msgid "1 day ago"
-msgstr ""
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, c-format
-msgid "%d days ago"
-msgstr ""
-
-#: filter/filter-datespec.c:69
 msgid "1 week ago"
-msgstr ""
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, c-format
-msgid "%d weeks ago"
-msgstr ""
-
-#: filter/filter-datespec.c:70
 msgid "1 month ago"
-msgstr ""
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
 #, c-format
-msgid "%d months ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr ""
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr ""
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%m/%d/%Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+msgid "_Filter Rules"
 msgstr ""
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr ""
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "Organisation"
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr ""
 
@@ -11671,23 +11699,23 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr ""
 
@@ -11695,48 +11723,53 @@ msgstr ""
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
+msgstr "_Other Organiser"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:772
-msgid "If"
+#: filter/filter-rule.c:779
+msgid "<b>If</b>"
 msgstr ""
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
+msgid "    "
 msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
+msgid "<b>_Filter Rules</b>"
 msgstr ""
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
+msgid "<b>vFolder Sources</b>"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:5
@@ -11744,80 +11777,68 @@ msgid "Incoming"
 msgstr ""
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr ""
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr ""
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr ""
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr ""
 
@@ -11951,7 +11972,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -11981,7 +12002,7 @@ msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
+msgid "Pipe to Program"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
@@ -12016,21 +12037,21 @@ msgstr ""
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:53
+msgid "Run Program"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "Sender"
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "Set Status"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Shell Command"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
@@ -12057,9 +12078,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
@@ -12068,17 +12089,13 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr ""
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
@@ -12090,8 +12107,8 @@ msgstr ""
 msgid "Rule name"
 msgstr ""
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+msgid "_Score Rules"
 msgstr ""
 
 #: filter/searchtypes.xml.h:1
@@ -12126,15 +12143,20 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Synchronising folder"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr ""
 
@@ -12188,8 +12210,8 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr ""
@@ -12198,53 +12220,49 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr ""
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr ""
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
+#: mail/em-composer-prefs.c:1000
+msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr ""
 
@@ -12289,7 +12307,7 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12321,398 +12339,427 @@ msgstr "Can not open message"
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Can not rename folder: %s: No such folder"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Synchronising folders"
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr ""
 
@@ -12721,124 +12768,156 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Can not open message"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr ""
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+msgid "Every time"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+msgid "Once per week"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:88
+msgid "Once per month"
+msgstr ""
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12847,22 +12926,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Could not close temporary folder: %s"
@@ -12902,57 +12981,57 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12961,44 +13040,44 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Can not open message"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "Chile"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr ""
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13007,7 +13086,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13072,255 +13151,287 @@ msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Default reply style"
+msgid "Default height of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Default width of the Composer Window"
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Message Window"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
-msgid "Enable/disable caret mode"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:23
-msgid "Height of the message-list pane"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:24
-msgid "Height of the message-list pane."
+msgid "Enable/disable caret mode"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13328,109 +13439,109 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr ""
 
@@ -13471,14 +13582,14 @@ msgstr ""
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13523,12 +13634,12 @@ msgstr "Organisation"
 msgid "Scanning %s"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:650
+#: mail/importers/netscape-importer.c:651
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13543,7 +13654,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13551,7 +13662,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13560,23 +13671,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13604,59 +13715,28 @@ msgstr ""
 msgid "Pine"
 msgstr ""
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr ""
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -13689,11 +13769,11 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13701,84 +13781,85 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Synchronising folders"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13787,623 +13868,637 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr ""
 
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr ""
+
 #: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+msgid "<b>Preview</b>"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Organisation"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
+msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
+msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:20
-msgid "Attach original message"
+msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:22
-msgid "Authentication"
+msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
+msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
+msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:26
-#, fuzzy
-msgid "C_olors"
-msgstr "C_lose"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:27
-msgid "Check _Incoming Mail"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:28
-msgid "Check spelling while I _type"
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:30
-msgid "Checks incoming mail messages to be Junk"
+msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Color for _misspelled words:"
-msgstr "Colours for display"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:32
-msgid "Composing Messages"
+msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Configuration"
+msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:34
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
+msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "De_fault"
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:42
-msgid "Default Behavior"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 #: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+msgid "Attachment"
 msgstr ""
 
 #: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
+msgid "Automatically _insert smiley images"
 msgstr ""
 
 #: mail/mail-config.glade.h:47
-#, fuzzy
-msgid "Do not quote original message"
-msgstr "Can not open message"
+msgid "Automatically check for _new mail every"
+msgstr ""
 
 #: mail/mail-config.glade.h:48
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Done"
+#: mail/mail-config.glade.h:49
+msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
 #: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "C_haracter set:"
 msgstr ""
 
 #: mail/mail-config.glade.h:52
-msgid "Email Accounts"
+msgid "Ch_eck for Supported Types "
 msgstr ""
 
 #: mail/mail-config.glade.h:53
-msgid "Email _address:"
+msgid "Check _Incoming Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+msgid "Check spelling while I _type"
 msgstr ""
 
 #: mail/mail-config.glade.h:55
-msgid "Encry_ption certificate:"
+msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Evolution Account Assistant"
-msgstr ""
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Colours for display"
 
 #: mail/mail-config.glade.h:57
-msgid "Execute Command..."
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "C_lose"
 
 #: mail/mail-config.glade.h:58
-msgid "Fi_xed -width:"
+msgid "Confirm _when expunging a folder"
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
-msgid "Font Properties"
-msgstr ""
-
-#: mail/mail-config.glade.h:61
-msgid "Format messages in _HTML"
-msgstr ""
-
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Highlight _quotations with"
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:64
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:65
+msgid "De_fault"
 msgstr ""
 
 #: mail/mail-config.glade.h:67
-msgid "Inline"
+msgid "Default character e_ncoding:"
 msgstr ""
 
 #: mail/mail-config.glade.h:68
-msgid "Kerberos "
+msgid "Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr ""
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Can not open message"
 
 #: mail/mail-config.glade.h:71
-msgid "Loading Images"
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Mail Configuration"
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
-msgid "Mailbox location"
-msgstr ""
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "Synchronising folder"
 
 #: mail/mail-config.glade.h:75
-msgid "Message Composer"
+msgid "Email Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr ""
+#, fuzzy
+msgid "Email _Address:"
+msgstr "Chile"
 
 #: mail/mail-config.glade.h:77
-msgid "Message Fonts"
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
 msgstr ""
 
 #: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Fi_xed -width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
-msgid "Optional Information"
+msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
-#, fuzzy
-msgid "Or_ganization:"
-msgstr "Organi_sation:"
+#: mail/mail-config.glade.h:83
+msgid "Format messages in _HTML"
+msgstr ""
 
 #: mail/mail-config.glade.h:85
-msgid "PGP/GPG _Key ID:"
+msgid "HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
-msgid "Pick a color"
-msgstr "Pick a colour"
+#: mail/mail-config.glade.h:86
+msgid "Headers"
+msgstr ""
 
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:87
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
+#: mail/mail-config.glade.h:88
+msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
+#: mail/mail-config.glade.h:91
+msgid "Inline"
 msgstr ""
 
 #: mail/mail-config.glade.h:93
-msgid "Qmail maildir "
+msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Quote original message"
-msgstr "Can not open message"
-
 #: mail/mail-config.glade.h:95
-msgid "Quoted"
-msgstr ""
-
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
+msgid "Mail Configuration"
 msgstr ""
 
 #: mail/mail-config.glade.h:97
-msgid "Re_ply-To:"
+msgid "Mailbox location"
 msgstr ""
 
 #: mail/mail-config.glade.h:98
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
+msgid "Message Composer"
 msgstr ""
 
 #: mail/mail-config.glade.h:101
-msgid "Required Information"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
 #: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr ""
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:106
-msgid "Select HTML fixed width font"
+#: mail/mail-config.glade.h:103
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
 #: mail/mail-config.glade.h:107
-msgid "Select HTML fixed width font for printing"
-msgstr ""
+msgid "Pick a color"
+msgstr "Pick a colour"
 
 #: mail/mail-config.glade.h:108
-msgid "Select HTML variable width font"
+msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
 #: mail/mail-config.glade.h:109
-msgid "Select HTML variable width font for printing"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
 #: mail/mail-config.glade.h:110
-msgid "Sending Email"
+msgid "Qmail maildir "
 msgstr ""
 
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Quote original message"
+msgstr "Can not open message"
+
 #: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
+msgid "Re_member password"
 msgstr ""
 
 #: mail/mail-config.glade.h:114
-msgid "Ser_ver requires authentication"
+msgid "Re_ply-To:"
 msgstr ""
 
 #: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:116
-msgid "Server _Type: "
+msgid "Receiving Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:117
-msgid "Si_gning certificate:"
+msgid "Receiving Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:118
-msgid "Specify _filename:"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+msgid "Remember _password"
 msgstr ""
 
 #: mail/mail-config.glade.h:120
-msgid "Standard Unix mbox"
+msgid "S_tandard Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:121
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:122
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:123
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
 #: mail/mail-config.glade.h:124
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+#: mail/mail-config.glade.h:125
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
-msgid "Use _Daemon"
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:127
+msgid "Sending Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:130
-msgid "V_ariable-width:"
-msgstr ""
+#, fuzzy
+msgid "Sent _Messages Folder:"
+msgstr "Synchronising folder"
 
 #: mail/mail-config.glade.h:131
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
+msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
-msgid "_Add Signature"
+#: mail/mail-config.glade.h:132
+msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:133
+msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:134
+msgid "Signat_ure:"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
+#: mail/mail-config.glade.h:135
+msgid "Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
+#: mail/mail-config.glade.h:136
+msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
+#: mail/mail-config.glade.h:138
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
+#: mail/mail-config.glade.h:139
+msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
+#: mail/mail-config.glade.h:140
+msgid "T_ype: "
 msgstr ""
 
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
+#: mail/mail-config.glade.h:141
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
+#: mail/mail-config.glade.h:144
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Do not notify me when new mail arrives"
+#: mail/mail-config.glade.h:146
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:149
-msgid "_Enable"
+#: mail/mail-config.glade.h:148
+msgid "Use _Daemon"
 msgstr ""
 
 #: mail/mail-config.glade.h:150
-msgid "_Encrypt outgoing messages (by default)"
+msgid "V_ariable-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:151
-msgid "_Forward style:"
-msgstr ""
-
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:156
-msgid "_Identity"
+msgid "_Add Signature"
 msgstr ""
 
 #: mail/mail-config.glade.h:157
-msgid "_Junk"
+msgid "_Always load images from the Internet"
 msgstr ""
 
 #: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in address book"
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
 #: mail/mail-config.glade.h:159
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:160
-msgid "_Make this my default account"
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
 #: mail/mail-config.glade.h:161
-msgid "_Mark messages as read after"
+msgid "_Enable"
 msgstr ""
 
 #: mail/mail-config.glade.h:162
-msgid "_Name:"
+msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
 #: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
+msgid "_Forward style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Load images if sender is in address book"
 msgstr ""
 
 #: mail/mail-config.glade.h:167
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Local Tests Only"
 msgstr ""
 
 #: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
+msgid "_Make this my default account"
 msgstr ""
 
 #: mail/mail-config.glade.h:169
-msgid "_Reply style:"
+msgid "_Mark messages as read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
+msgid "_Name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:171
-msgid "_Script:"
+msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Organisation"
-
 #: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Show animated images"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
-msgid "_Signatures"
+msgid "_Reply style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
+msgid "_Script:"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
+msgid "_Show animated images"
 msgstr ""
 
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+msgid "_minute(s)"
+msgstr ""
+
 #: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "color"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -14411,175 +14506,170 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr ""
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr ""
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr ""
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -14592,107 +14682,103 @@ msgstr ""
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr ""
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
+msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr ""
 
@@ -14720,17 +14806,17 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr "Can not get folder: %s: %s"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14739,84 +14825,84 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr ""
 
@@ -14865,7 +14951,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr ""
 
@@ -14873,11 +14959,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr ""
 
@@ -14900,7 +14986,7 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr ""
 
 #: mail/message-tags.glade.h:7
@@ -15107,7 +15193,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -15130,82 +15216,82 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Could not close temporary folder: %s"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr ""
 
@@ -15213,7 +15299,7 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15248,11 +15334,11 @@ msgstr "Could not close temporary folder: %s"
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15261,10 +15347,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr ""
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -15307,15 +15389,15 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr ""
 
@@ -15364,7 +15446,6 @@ msgstr "Chile"
 
 #: shell/e-user-creatable-items-handler.c:601
 #: shell/e-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
 msgid "New"
 msgstr ""
 
@@ -15409,15 +15490,16 @@ msgid "Create a new test item"
 msgstr "_Other Organiser"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr ""
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "Organisation"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+msgid "Active Connections"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -15526,28 +15608,28 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15567,101 +15649,110 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "C_lose"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Chile"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr ""
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+msgid "Enter new password for certificate database"
+msgstr ""
+
+#: smime/gui/component.c:70
+msgid "Enter new password"
+msgstr ""
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -15850,7 +15941,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Could not close temporary folder: %s"
@@ -16129,7 +16221,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -16138,8 +16230,8 @@ msgid "Previews the contacts to be printed"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr ""
 
@@ -16187,13 +16279,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr ""
 
@@ -16214,14 +16306,10 @@ msgid "_Save as VCard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -16229,56 +16317,52 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
+#: ui/evolution-calendar.xml.h:13
+msgid "List"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
+msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
-msgid "List"
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:17
-msgid "Month"
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Previews the calendar to be printed"
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
@@ -16289,7 +16373,7 @@ msgstr ""
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr ""
 
@@ -16298,34 +16382,53 @@ msgid "Purge old appointments and meetings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "_Other Organiser"
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Organisation"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr ""
 
@@ -16594,7 +16697,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -16761,307 +16864,307 @@ msgid "F_orward As..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Filter on Mailing _List..."
+msgid "Filter _Junk"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Filter on Se_nder..."
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Filter on _Recipients..."
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Subject..."
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
-msgid "Flag selected message(s) for follow-up"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:38
-msgid "Follow _Up..."
+msgid "Filter the selected messages for junk status"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:39
-msgid "Force images in HTML mail to be loaded"
+msgid "Flag selected message(s) for follow-up"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr ""
 
@@ -17327,39 +17430,39 @@ msgstr ""
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr ""
 
@@ -17488,10 +17591,14 @@ msgid "_Day View"
 msgstr ""
 
 #: views/calendar/galview.xml.h:3
-msgid "_Month View"
+msgid "_List View"
 msgstr ""
 
 #: views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr ""
 
@@ -17521,10 +17628,15 @@ msgid "_Messages"
 msgstr ""
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr ""
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Other Organiser"
 
 #: views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr ""
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr ""
 
@@ -17581,14 +17693,10 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr ""
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -17598,82 +17706,86 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+msgid "Western European, New"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr ""
 
@@ -17736,11 +17848,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Other Organiser"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr ""
 
@@ -17760,15 +17877,15 @@ msgstr ""
 msgid "Choose Image"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr ""
 
@@ -17799,6 +17916,18 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
 #~ msgid ""
 #~ "Could not create directory `%s':\n"
 #~ "%s"
@@ -17951,10 +18080,6 @@ msgstr ""
 #~ msgstr "Synchronising folders"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
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"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 02c614fc3a..63ee188c7e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-31 18:53-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-31 18:55-0500\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: \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
@@ -127,7 +127,7 @@ 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:313
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -183,31 +183,31 @@ msgstr "_Address Book"
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: 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"
 
@@ -245,7 +245,7 @@ msgstr "On This Computer"
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: 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"
@@ -409,43 +409,39 @@ msgid "1:00"
 msgstr "1:00"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "2:30"
-msgstr "2:30"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: 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:10
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:11 mail/mail-account-gui.c:65
+#: 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:12
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonymously"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -457,51 +453,51 @@ msgstr ""
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Connecting"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: 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:21
+#: 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:22
+#: 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:23
+#: 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 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: 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:25 mail/mail-account-gui.c:67
+#: 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:27
+#: 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"
@@ -517,23 +513,19 @@ msgstr ""
 "your connection. Ask your system administrator if your LDAP server uses "
 "these protocols."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "S_earch scope: "
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Searching"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "Selected:"
-msgstr "Selected:"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -543,7 +535,7 @@ msgstr ""
 "server if\n"
 "your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: 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"
@@ -561,7 +553,7 @@ msgstr ""
 "is already\n"
 "secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: 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"
@@ -575,7 +567,7 @@ msgstr ""
 "to security\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: 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 "
@@ -586,7 +578,7 @@ msgstr ""
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: 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"
@@ -596,32 +588,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:48
+#: 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:49
+#: 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:50
+#: 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:51
+#: 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:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -635,7 +627,7 @@ msgstr ""
 "if you\n"
 "need to change these options."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: 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"
@@ -647,7 +639,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:59
+#: 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"
@@ -663,7 +655,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:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -679,7 +671,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:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -687,7 +679,7 @@ msgstr ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -697,7 +689,7 @@ msgstr ""
 "be \n"
 "too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: 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 "
@@ -707,7 +699,7 @@ msgstr ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: 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"
@@ -717,7 +709,7 @@ msgstr ""
 "list.\n"
 "It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: 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 "
@@ -726,7 +718,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:76
+#: 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"
@@ -738,28 +730,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:79
+#: 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:80
+#: 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:81
+#: 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:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:83 mail/mail-account-gui.c:66
+#: 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:84
+#: 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"
@@ -771,48 +763,48 @@ msgstr ""
 "log in information. Please ask your system administrator if you are unsure "
 "of this information."
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: 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:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Port number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Server name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -2126,7 +2118,7 @@ msgstr "Home"
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: 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"
@@ -3813,7 +3805,7 @@ msgstr "Comment contains"
 msgid "Location contains"
 msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1058
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Unmatched"
 
@@ -4145,7 +4137,7 @@ 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:492
-#: mail/em-composer-prefs.c:719 mail/em-composer-prefs.c:884
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4161,8 +4153,8 @@ msgstr "Don't Remove"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: 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:686 mail/em-composer-prefs.c:704
-#: mail/em-composer-prefs.c:728
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "Disable"
 
@@ -4170,8 +4162,8 @@ msgstr "Disable"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: 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:686 mail/em-composer-prefs.c:704
-#: mail/em-composer-prefs.c:728
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr "Enable"
 
@@ -4933,9 +4925,9 @@ msgstr "_Start time:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2091
+#: 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:1316 mail/mail-account-gui.c:1850
+#: 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:443
@@ -5590,7 +5582,7 @@ msgstr "No"
 #: 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:2133
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -6508,7 +6500,7 @@ msgstr "Web Page:"
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6559,32 +6551,32 @@ msgstr "Deleting selected objects..."
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/gnome-cal.c:1758
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1777
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1797
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:1926
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "The calendar backend for '%s' has crashed."
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1940
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr "The task backend for '%s' has crashed."
 
-#: calendar/gui/gnome-cal.c:2752
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Purging"
 
@@ -8859,7 +8851,7 @@ 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-ops.c:696
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
 #: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -9449,12 +9441,12 @@ msgstr "Cannot create folder: Invalid operation on this store"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1078
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Trash"
 
 #: camel/camel-store.c:795 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 mail/mail-ops.c:1082
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
@@ -11416,13 +11408,13 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: composer/e-msg-composer.c:660
+#: 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:666
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11430,7 +11422,7 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11529,35 +11521,35 @@ msgstr "Warning: Modified Message"
 msgid "Open file"
 msgstr "Open file"
 
-#: composer/e-msg-composer.c:2052
-msgid "Signature:"
-msgstr "Signature:"
-
-#: composer/e-msg-composer.c:2092 mail/mail-account-gui.c:1317
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2270
+#: 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:2299
+#: 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:2302 composer/e-msg-composer.c:3178
+#: 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:2319 composer/e-msg-composer.c:3060
-#: composer/e-msg-composer.c:3061
+#: 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:3090
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11565,7 +11557,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 
-#: composer/e-msg-composer.c:3119
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11577,7 +11569,7 @@ msgstr ""
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 
-#: composer/e-msg-composer.c:3223
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11585,7 +11577,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 
-#: composer/e-msg-composer.c:4246
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11938,18 +11930,18 @@ 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:90
+#: 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
+#: 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
+#: 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"
@@ -12449,7 +12441,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
 #: 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:1872
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Mail"
@@ -12483,28 +12475,25 @@ msgstr "Account name"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:229 mail/em-composer-prefs.c:355
-#: 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:339
+#: 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:397 mail/em-composer-prefs.c:459
-msgid "[script]"
-msgstr "[script]"
-
-#: mail/em-composer-prefs.c:888
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:936
-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:956
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
@@ -12896,7 +12885,7 @@ msgstr "Click to mail %s"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 msgid "Unsigned"
 msgstr "Unsigned"
 
@@ -12908,7 +12897,7 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:567
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr "Valid signature"
 
@@ -12920,7 +12909,7 @@ 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:647 mail/em-format-html.c:568
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
@@ -12932,7 +12921,7 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:569
+#: 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"
 
@@ -12944,7 +12933,7 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:654 mail/em-format-html.c:575
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
@@ -12956,7 +12945,7 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:576
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
@@ -12970,7 +12959,7 @@ 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:656 mail/em-format-html.c:577
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr "Encrypted"
 
@@ -12982,7 +12971,7 @@ 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:657 mail/em-format-html.c:578
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
@@ -13029,41 +13018,41 @@ msgstr "_Hide"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:459 mail/em-format-html.c:461
+#: 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:838
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: mail/em-format-html.c:868
+#: 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:879
+#: 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:881
+#: 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:902
+#: 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:913
+#: 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:1155
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Formatting message"
 
@@ -13095,7 +13084,7 @@ msgstr "Bcc"
 
 #. pseudo-header
 #: mail/em-format-html.c:1542 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -13190,22 +13179,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"
@@ -13872,14 +13861,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"
 
@@ -13924,12 +13913,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"
@@ -13955,7 +13944,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"
@@ -13967,7 +13956,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"
@@ -13981,23 +13970,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?"
@@ -14050,7 +14039,7 @@ msgstr "User_name:"
 msgid "_Path:"
 msgstr "_Path:"
 
-#: mail/mail-account-gui.c:2086
+#: 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."
 
@@ -14191,11 +14180,11 @@ 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..."
 
@@ -14836,20 +14825,20 @@ msgstr ""
 msgid "Working"
 msgstr "Working"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:88
 msgid "Filtering Folder"
 msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:248
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:533
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:558
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14858,115 +14847,115 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:567
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:663
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:695
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:795
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:880
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:880
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:993
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1232
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1304
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1382
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1476
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1541
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1542
+#: mail/mail-ops.c:1543
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1633 mail/mail-ops.c:1684
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1765
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retreiving %d messages"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:1924
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: mail/mail-ops.c:1973
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14975,7 +14964,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2001
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14984,11 +14973,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2072
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2089
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14997,17 +14986,17 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2267
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2267
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
@@ -15092,12 +15081,12 @@ msgstr "_Remember this password"
 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:84
+#: 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:230
+#: mail/mail-signature-editor.c:233
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -15107,23 +15096,23 @@ msgstr ""
 "\n"
 "Do you wish to save your changes?"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: mail/mail-signature-editor.c:237
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Save signature"
 
-#: mail/mail-signature-editor.c:386
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Edit signature"
 
-#: mail/mail-signature-editor.c:426
+#: 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:429
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Name:"
 
@@ -15814,7 +15803,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"
 
@@ -17979,10 +17967,15 @@ msgid "_Day View"
 msgstr "_Day View"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Synchronising \"%s\""
+
+#: 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"
 
@@ -18011,10 +18004,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"
 
@@ -18086,82 +18085,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..."
 
@@ -18292,6 +18296,21 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Selected:"
+#~ msgstr "Selected:"
+
+#~ msgid "[script]"
+#~ msgstr "[script]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Add script signature"
+
+#~ msgid "With _Category"
+#~ msgstr "With _Category"
+
 #~ msgid "Address Book Sources"
 #~ msgstr "Address Book Sources"
 
@@ -18390,10 +18409,6 @@ msgstr "%s (%d%% complete)"
 #~ msgstr "Organisation:"
 
 #, fuzzy
-#~ msgid "List View"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Description"
 #~ msgstr "Synchronising \"%s\""
 
diff --git a/po/es.po b/po/es.po
index 8fdf450f1b..a5eb7c848c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-28 19:56+0200\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-28 20:46+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.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"
 "serrador@hispalinux.es>\n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -90,7 +90,6 @@ msgstr "Configure el autocompletado aquí"
 #. 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
@@ -139,74 +138,90 @@ msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "La libreta «%s» será eliminada. ¿Seguro que quiere continuar?"
 
 #: addressbook/gui/component/addressbook-component.c:313
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
 #: addressbook/gui/component/addressbook-component.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:434 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/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 "Borrar"
 
 #: addressbook/gui/component/addressbook-component.c:315
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:566
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Libreta de direcciones nueva"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Libreta de direcciones"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Crea una tarea nueva"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Falló al conectarse al servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falló al autenticarse con el servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "No se pudo efectuar la consulta en la raíz 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 "El servidor respondió con bases de búsqueda no soportadas"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Este servidor no soporta el esquema de información LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Error al obtener información del esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "El servidor no respondió con una información del esquema válida"
 
@@ -234,21 +249,17 @@ msgid "Migrating `%s':"
 msgstr "Migrando «%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:430 calendar/gui/migration.c:509
+#: 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 "En este equipo"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:517
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: 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 "Privado"
@@ -294,17 +305,19 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr ""
+"El soporte de esta libreta de direcciones no pudo analizar esta consulta."
 
 #: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr ""
+"El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
 
 #: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito."
 
-#: 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."
@@ -312,7 +325,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones. Compruebe que la ruta exista y "
 "que tenga permisos para acceder a ella."
 
-#: 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."
@@ -320,7 +333,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: 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 "
@@ -330,7 +343,7 @@ msgstr ""
 "usar LDAP en Evolution debe compilar el programa de las fuentes del CVS una "
 "vez que haya obtenido OpenLDAP del siguiente enlace."
 
-#: 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."
@@ -338,28 +351,28 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la libreta de direcciones"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Falló al autenticarme.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseña para %s (usuario %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 de la fuente de contactos que la vista mostrará"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "La URI que mostrará la libreta de direcciones"
 
@@ -386,15 +399,10 @@ msgstr ""
 "nombres"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr " Mo_strar bases soportadas "
 
-#: 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
@@ -416,52 +424,44 @@ msgstr " Mo_strar bases soportadas "
 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 "Asistente de creación de libretas de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Fuentes de la libreta de direcciones"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Siempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anónimamente"
 
-#: 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"
@@ -474,49 +474,52 @@ msgstr ""
 "Por favor, pulse el botón «Aplicar» para guardar la configuración que ha "
 "introducido aquí."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Conexión"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "_Nombre distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Dirección de correo-e:"
 
-#: 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 usará este Nombre Distintivo para autenticarle con el servidor"
+msgstr ""
+"Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor"
+#: addressbook/gui/component/ldap-config.glade.h:20
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor"
 
-#: 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 "Terminar"
 
-#: 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 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 "Grupo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nunca"
 
-#: 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"
@@ -531,23 +534,19 @@ msgstr ""
 "para proteger criptográficamente la conexión. Pregunte a su administrador de "
 "sistemas si sus servidores LDAP usan estos protocolos."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Ámbito de bú_squeda: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Seleccionado:"
-
-#: 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"
@@ -557,7 +556,7 @@ msgstr ""
 "servidores LDAP si\n"
 "sus servidores LDAP soportan SSL o 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"
@@ -573,7 +572,7 @@ msgstr ""
 "cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS "
 "porque su conexión ya es segura."
 
-#: 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"
@@ -586,7 +585,7 @@ msgstr ""
 "significa que su conexión será insegura y que usted será vulnerable a fallos "
 "de seguridad."
 
-#: 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 "
@@ -597,7 +596,7 @@ msgstr ""
 "predeterminada de Evolution para consultas LDAP\n"
 "y para crear y editar contactos."
 
-#: 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"
@@ -607,32 +606,32 @@ msgstr ""
 "\t\t\t  un nombre para mostrar es el primer paso requerido para\n"
 "\t\t\t  configurar una libreta de direcciones."
 
-#: 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 "Paso 1: Características de la carpeta"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Paso 2: Información del servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Paso 3: Conexión con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Paso 4: Búsqueda en el directorio"
 
-#: 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 "Bases de búsqueda soportadas"
 
-#: 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"
@@ -645,7 +644,7 @@ msgstr ""
 "administrador de sistemas si\n"
 "necesita cambiar estas opciones."
 
-#: 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"
@@ -657,7 +656,7 @@ msgstr ""
 "Si deja esto en blanco, la búsqueda empezará en la raíz del árbol de "
 "directorios."
 
-#: 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"
@@ -674,7 +673,7 @@ msgstr ""
 "las entradas \n"
 "un nivel bajo su 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"
@@ -690,7 +689,7 @@ msgstr ""
 "parámetros adicionales. contacte con su administrador de sistemas\n"
 "si necesita ayuda para encontrar esta información."
 
-#: 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"
 "\"."
@@ -698,7 +697,7 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "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"
@@ -707,7 +706,7 @@ msgstr ""
 "Este es el máximo número de entradas para descargar.  Si pone este número\n"
 "demasiado alto ralentizará su libreta de direcciones."
 
-#: 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 "
@@ -717,7 +716,7 @@ msgstr ""
 "establecer esto a «Dirección de Correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: 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"
@@ -726,7 +725,7 @@ msgstr ""
 "Este nombre será usado para identificar este servidor.\n"
 "Es sólo para poder mostrarlo en pantalla."
 
-#: 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 "
@@ -735,7 +734,7 @@ msgstr ""
 "Este es el nombre aparecerá en su lista de carpetas de Evolution.Es sólo "
 "para poder mostrarlo en pantalla."
 
-#: 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"
@@ -747,28 +746,29 @@ msgstr ""
 "administrador del\n"
 "sistema qué puerto debería especificar."
 
-#: 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 "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
+msgstr ""
+"Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "U_sar SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre Distintivo (ND)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: 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"
@@ -780,66 +780,55 @@ msgstr ""
 "de inicio de sesión. Por favor pregunte a su administrador de sistemas si no "
 "está seguro de esta información."
 
-#: 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 "_Mostrar nombre:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: 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:17
-#: mail/mail-config.glade.h:160 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 "_Editar"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "Método de _inicio de sesión:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "Número de _puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Base de _búsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Tiempo de expiración (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "Conexión"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "búsqueda"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaz de selección de nombre de la libreta de direcciones de Evolution"
+msgstr ""
+"Interfaz de selección de nombre de la libreta de direcciones de Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:207
 msgid "Remove All"
@@ -881,7 +870,7 @@ msgstr "Nombre"
 
 #: 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 "Fuente"
 
@@ -948,7 +937,8 @@ msgstr "Colaboración"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1043,15 +1033,26 @@ msgstr "_Categorías..."
 #. 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-calendar-table.c:1057 calendar/gui/e-calendar-table.c:1075
-#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1366
-#: mail/em-folder-tree.c:2504 mail/em-folder-view.c:765
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Borrar"
 
+#: 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 "_Editar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Domicilio:"
@@ -2089,7 +2090,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:2813
+#: 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"
@@ -2104,7 +2105,7 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2816
+#: 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"
@@ -2127,22 +2128,22 @@ msgid "Username"
 msgstr "Nombre de usuario"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2481
-#: addressbook/gui/contact-editor/e-contact-editor.c:2777
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Domicilio"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2781
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: 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 "Trabajo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2482
-#: addressbook/gui/contact-editor/e-contact-editor.c:2785
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Otro"
 
@@ -2177,45 +2178,45 @@ msgstr "Modificados"
 msgid "Account Name"
 msgstr "Nombre de la cuenta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1463
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1471
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1695
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Guardar contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2480
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: 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:2814
+#: 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:2815
+#: 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:2817
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No se pudo encontrar el widget para el campo: «%s»"
@@ -2370,6 +2371,10 @@ msgstr "Servicio de _MI:"
 msgid "_Location:"
 msgstr "_Lugar:"
 
+#: 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 "Miembros"
@@ -2384,7 +2389,8 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2393,7 +2399,7 @@ msgstr "Editor de lista de contactos"
 #: 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"
@@ -2405,6 +2411,7 @@ msgstr "Es una lista nueva"
 
 #. Construct the app
 #: 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 "Editor de listas de contactos"
 
@@ -2468,7 +2475,7 @@ msgstr[1] "%d contactos"
 
 #: 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"
@@ -2486,30 +2493,31 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: 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 "La categoría es"
 
 #. 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 "Cualquier campo contiene"
 
-#: 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 "Avanzado..."
 
-#: 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:12
 #: calendar/gui/e-meeting-list-view.c:249
@@ -2517,95 +2525,96 @@ msgstr "Avanzado..."
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Guardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Contacto nuevo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Lista de contactos nueva..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Buscar contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Fuentes de la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Configuración del Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Envía un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Imprimir sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Copiar a la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Mover a la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:432 calendar/gui/tasks-component.c:363
+#: 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 "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: 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 "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1302
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Vista actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2617,7 +2626,7 @@ msgstr ""
 "se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Cualquier categoría"
@@ -2927,7 +2936,6 @@ msgstr "Éxito"
 #: 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/imap4/camel-imap-store.c:263
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
@@ -3150,17 +3158,17 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test de reflujo"
 
-#: 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 © 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 "Esto debería probar el reflujo del elemento lienzo"
 
@@ -3417,7 +3425,8 @@ msgid "Export in asynchronous mode "
 msgstr "Exportar en modo asíncrono"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -3427,7 +3436,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -3790,15 +3800,18 @@ msgstr "Indica si debe ocultar las áreas terminadas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
-msgstr "Indica si debe establecer un recordatorio predeterminado para los eventos"
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para los eventos"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr "Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
+msgstr ""
+"Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas"
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
@@ -3841,7 +3854,7 @@ msgid "Purge events older than"
 msgstr "Purgar eventos anteriores a"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "días"
 
@@ -3851,12 +3864,8 @@ msgstr "%A, %d de %B de %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:1589 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 de %b"
 
@@ -3883,65 +3892,65 @@ msgstr "%d de %B"
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "La Agenda «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: calendar/gui/calendar-component.c:430
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:926
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:927
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:928
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:935
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Cita para todo el _día"
 
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_Agenda"
 
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Crear una agenda nueva"
 
-#: calendar/gui/calendar-component.c:1016
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "no se pudo abrir la agenda «%s» para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:1028
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay una agenda disponible para crear eventos y reuniones"
 
@@ -4061,11 +4070,11 @@ msgstr "diálogo1"
 msgid "extra times every"
 msgstr "veces adicionales cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "minutos"
 
@@ -4151,8 +4160,8 @@ msgstr "comienzo de cita"
 
 #. 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:493
-#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
+#: 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 "Habilitado"
 
@@ -4166,19 +4175,19 @@ msgstr "No eliminar"
 
 #: 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:399
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Desactivar"
 
 #: 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:401
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Activar"
 
@@ -4322,7 +4331,7 @@ msgid "Wednesday"
 msgstr "Miércoles"
 
 #: 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 "Semana laboral"
 
@@ -4388,7 +4397,8 @@ msgstr "_Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
@@ -4465,7 +4475,7 @@ msgstr ""
 "introducido aquí."
 
 #: 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 "Lista de tareas nueva"
 
@@ -4685,8 +4695,8 @@ msgid "No summary"
 msgstr "Sin resumen"
 
 #: calendar/gui/dialogs/comp-editor.c:1360
-#: calendar/gui/e-calendar-table.c:1190 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Guardar como..."
 
@@ -4788,7 +4798,8 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr ""
+"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
@@ -4942,16 +4953,11 @@ msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #. 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:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: 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:443
@@ -5081,15 +5087,18 @@ msgstr "Nombre de la lista de tareas"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5188,7 +5197,7 @@ msgid "_No recurrence"
 msgstr "Si_n repetición"
 
 #: 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 "_Quitar"
 
@@ -5230,7 +5239,7 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: 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 "_Descartar cambios"
 
@@ -5269,7 +5278,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+msgstr ""
+"La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
@@ -5294,7 +5304,7 @@ msgstr "Terminado"
 
 #: 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 "Alta"
 
@@ -5307,13 +5317,13 @@ msgstr "En proceso"
 
 #: 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 "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Normal"
 
@@ -5604,14 +5614,9 @@ msgstr "No"
 #: 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/imap4/camel-imap-engine.c:1524
-#: camel/providers/imap4/camel-imap-engine.c:1551
-#: camel/providers/imap4/camel-imap-engine.c:1581
-#: camel/providers/imap4/camel-imap-engine.c:1621
-#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
-#: 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 "Desconocido"
 
@@ -5667,84 +5672,84 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:698 calendar/gui/e-calendar-view.c:680
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:861 calendar/gui/e-calendar-view.c:781
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1382
+#: 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 "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1316 calendar/gui/e-calendar-view.c:1388
+#: 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 "Guardar _como..."
 
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1082
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1317
-#: calendar/gui/e-calendar-view.c:1386 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: 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:23
+#: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: calendar/gui/e-calendar-view.c:1322 calendar/gui/e-calendar-view.c:1364
+#: 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_ortar"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1362
-#: mail/em-folder-tree.c:2497 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
+#: 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 "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1080
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1324
-#: calendar/gui/e-calendar-view.c:1384 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
+#: 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 "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: 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 "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1368
+#: calendar/gui/e-calendar-table.c:1371
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Pulse aquí para añadir una tarea"
@@ -5755,7 +5760,7 @@ msgid "% Complete"
 msgstr "% Terminado"
 
 #: 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:597
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Completo"
 
@@ -5779,78 +5784,79 @@ msgstr "Fecha de inicio"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1374
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
 msgid "New _Appointment..."
 msgstr "Cit_a nueva..."
 
-#: calendar/gui/e-calendar-view.c:1288 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: calendar/gui/e-calendar-view.c:1289 calendar/gui/e-calendar-view.c:1378
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
 msgid "New Meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-calendar-view.c:1304 calendar/gui/e-calendar-view.c:1370
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Ir a _hoy"
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Seleccionar _conversación"
 
-#: calendar/gui/e-calendar-view.c:1305 calendar/gui/e-calendar-view.c:1372
-msgid "_Go to Date..."
-msgstr "_Ir a una fecha..."
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Seleccione..."
 
-#: calendar/gui/e-calendar-view.c:1309 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1274
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1275
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1330
+#: calendar/gui/e-calendar-view.c:1276
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión..."
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1277
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: calendar/gui/e-calendar-view.c:1390 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Ir a _hoy"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Ir a una fecha..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Configuración..."
 
 #. 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"
@@ -5874,33 +5880,26 @@ msgstr "%02i divisiones por minuto"
 
 #. 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:1572
+#: 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 de %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:1605
+#: 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 de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:822 calendar/gui/e-week-view.c:593
+#: 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:825 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6079,7 +6078,7 @@ msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6273,7 +6272,8 @@ msgstr "Actualización terminada\n"
 
 #: 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 "El estado de asistencia no puede ser actualizado porque no existe el elemento"
+msgstr ""
+"El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
 #: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
@@ -6443,10 +6443,6 @@ msgstr "%A, %d de %B de %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
@@ -6455,10 +6451,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6542,12 +6534,12 @@ msgstr "Prioridad:"
 msgid "Web Page:"
 msgstr "Página web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6598,32 +6590,32 @@ msgstr "Borrando los objetos seleccionados..."
 msgid "Expunging"
 msgstr "Compactando"
 
-#: calendar/gui/gnome-cal.c:1758
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: calendar/gui/gnome-cal.c:1777
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: calendar/gui/gnome-cal.c:1797
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: calendar/gui/gnome-cal.c:1926
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "El backend de la agenda para %s se ha colgado."
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1940
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr "El backend de tareas para %s se ha colgado."
 
-#: calendar/gui/gnome-cal.c:2752
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Compactando"
 
@@ -6644,44 +6636,46 @@ msgid "February"
 msgstr "Febrero"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ir a una fecha"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Enero"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Julio"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Junio"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mayo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Noviembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Octubre"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Seleccionar nombres"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septiembre"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Ir a hoy"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Seleccionar carpeta"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6771,7 +6765,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "En la web"
 
@@ -7011,36 +7005,37 @@ msgstr "Configurar impresión"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "La lista de tareas «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "Lista de _tareas"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: 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 "No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
+msgstr ""
+"No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay una agenda disponible para crear tareas"
 
@@ -8711,7 +8706,8 @@ msgstr "Resincronizando con el servidor"
 
 #: camel/camel-disco-folder.c:41
 msgid "Copy folder content locally for offline operation"
-msgstr "Copiar el contenido de la carpeta localmente para operación desconectada"
+msgstr ""
+"Copiar el contenido de la carpeta localmente para operación desconectada"
 
 #: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
@@ -8899,7 +8895,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Cancelado."
 
@@ -8958,7 +8954,8 @@ msgstr "Esta parte del mensaje está firmada digitalmente"
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+msgstr ""
+"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
 #: camel/camel-gpg-context.c:1397
 #, c-format
@@ -9012,7 +9009,8 @@ msgstr "No se pudo bloquear el archivo para %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgstr ""
+"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -9193,7 +9191,8 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr ""
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9201,7 +9200,8 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr ""
+"La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9262,7 +9262,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr ""
+"El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9279,7 +9280,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: 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:1198
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9473,29 +9474,29 @@ msgstr "Error de procesamiento"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Firmante: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No se pudo obtener la carpeta: Operación no válida en este almacén"
 
-#: camel/camel-store.c:242
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No se pudo crear la carpeta: Operación no válida en este almacén"
 
-#: camel/camel-store.c:377 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 "No se pudo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:773 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: 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"
@@ -9515,7 +9516,8 @@ msgstr "No se pudo descifrar la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr ""
+"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
@@ -9812,12 +9814,12 @@ msgstr "Lista de comprobación"
 #: 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:2902
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2905
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -9987,22 +9989,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y almacenar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:425
-#: camel/providers/imap4/camel-imap-store.c:141
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:427
-#: camel/providers/imap4/camel-imap-store.c:143
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio IMAP para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap-store.c:184
-#: camel/providers/imap4/camel-imap-store.c:201
+#: 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
@@ -10012,16 +10010,14 @@ msgstr "Servicio IMAP para %s en %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap-store.c:186
+#: 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 no disponible"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:801
-#: camel/providers/imap4/camel-imap-store.c:198
+#: 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
@@ -10029,50 +10025,49 @@ msgstr "SSL no disponible"
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/imap4/camel-imap-store.c:262
+#: 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 "Falló al conectar al servidor IMAP %s en modo seguro: %s"
 
-#: camel/providers/imap/camel-imap-store.c:636
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada."
 
-#: camel/providers/imap/camel-imap-store.c:667
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:804
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No se pudo conectar con el comando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1228
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1238
+#: 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 hay soporte para el tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: 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 "%s escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1304
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10083,22 +10078,22 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1723
-#: camel/providers/imap/camel-imap-store.c:1817
+#: 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 existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1734
-#: camel/providers/imap/camel-imap-store.c:2023
-#: camel/providers/imap4/camel-imap-store.c:611
+#: 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\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "El nombre de la carpeta «%s» es inválido porque no puede contener el "
 "carácter de retorno de carro «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:1758
+#: 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
@@ -10106,122 +10101,15 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
 
-#: camel/providers/imap/camel-imap-store.c:2035
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2071
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
-#: camel/providers/imap4/camel-imap-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP server %s: %s"
-msgstr "Respuesta inesperada del servidor IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:410
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "No se pudo seleccionar la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap-engine.c:1134
-#: camel/providers/imap4/camel-imap-engine.c:1523
-#: camel/providers/imap4/camel-imap-engine.c:1550
-#: camel/providers/imap4/camel-imap-engine.c:1580
-#: camel/providers/imap4/camel-imap-engine.c:1620
-#: camel/providers/imap4/camel-imap-utils.c:289
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:1135
-msgid "Got BYE response"
-msgstr "Se obtuvo una respuesta BYE"
-
-#: camel/providers/imap4/camel-imap-store.c:237
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Falló al conectar al servidor IMAP %s en modo seguro: El servidor no soporta STARTTLS"
-
-#: camel/providers/imap4/camel-imap-store.c:349
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"No se pudo autenticar con el servidor IMAP %s usando el mecanismo "
-"de autenticación %s"
-
-#: camel/providers/imap4/camel-imap-store.c:394
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s Escriba la contraseña IMAP para %s en el host %s"
-
-#: camel/providers/imap4/camel-imap-store.c:468
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
-
-#: camel/providers/imap4/camel-imap-store.c:647
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "No se pudo crear la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap-store.c:652
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap-store.c:674
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
-
-#: camel/providers/imap4/camel-imap-store.c:703
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap-store.c:708
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap-store.c:766
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap-store.c:771
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap-store.c:810
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap-store.c:815
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap-utils.c:83
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Etiqueta inesperada en la respuesta del servidor IMAP %s:"
-
-#: camel/providers/imap4/camel-imap-utils.c:106
-msgid "No data"
-msgstr "Sin datos"
-
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10254,20 +10142,20 @@ msgid "Index message body data"
 msgstr "Indexar datos del cuerpo del mensaje"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: 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:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "buzón: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10610,7 +10498,7 @@ msgstr "No se pudo cerrar la carpeta origen %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "No se pudo cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No se pudo cambiar el nombre a la carpeta: %s"
@@ -10856,8 +10744,10 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -10932,7 +10822,8 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "No puede crear una carpeta en un almacén de Noticias: suscríbase en su lugar."
+msgstr ""
+"No puede crear una carpeta en un almacén de Noticias: suscríbase en su lugar."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
 msgid "You cannot rename a folder in a News store."
@@ -11091,7 +10982,8 @@ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr ""
+"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
@@ -11127,7 +11019,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr ""
+"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -11225,7 +11118,8 @@ msgstr "El usuario no es local; lo reenviaré a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Acción solicitada del correo no realizada: el mailbox no está disponible"
+msgstr ""
+"Acción solicitada del correo no realizada: el mailbox no está disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
@@ -11241,7 +11135,8 @@ msgstr "El usuario no es local; pruebe con <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+msgstr ""
+"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11305,7 +11200,8 @@ msgstr "El comando STARTTLS ha fallado"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s."
+msgstr ""
+"El servidor SMTP %s no implementa el método de autenticación requerido %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11440,44 +11336,44 @@ msgstr "El comando QUIT ha fallado: %s"
 msgid "QUIT command failed"
 msgstr "El comando QUIT ha fallado"
 
-#: 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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "adjunto"
 
-#: 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 "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
-#: 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 "No se pudo adjuntar el archivo %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 "No se pudo adjuntar el archivo %s: no es un archivo normal"
@@ -11499,19 +11395,19 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: 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 "Necesita configurar una cuenta antes de poder escribir correo."
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicar destino"
 
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Pulse aquí para acceder a la libreta de direcciones"
 
@@ -11522,45 +11418,45 @@ msgstr "Pulse aquí para acceder a la libreta de direcciones"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:573
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:579
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: 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."
@@ -11571,11 +11467,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Publicar en:"
 
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 
@@ -11583,13 +11479,14 @@ msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: composer/e-msg-composer.c:652
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+#: composer/e-msg-composer.c:662
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "No se puede firmar el correo saliente: No hay establecido un certificado de "
 "firma para la cuenta remitente"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11597,7 +11494,7 @@ msgstr ""
 "No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
 "cifrado para la cuenta remitente."
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11606,30 +11503,30 @@ msgstr ""
 "Error leyendo el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿quiere sobreescribirlo?"
 
-#: 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 guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11638,7 +11535,7 @@ msgstr ""
 "No se pudo buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11647,7 +11544,7 @@ msgstr ""
 "No se pudo truncar el archivo: %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"
@@ -11656,7 +11553,7 @@ msgstr ""
 "No se pudo copiar el descriptor de archivo:  %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11665,7 +11562,7 @@ msgstr ""
 "Error auto guardando el mensaje: %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?"
@@ -11673,7 +11570,7 @@ msgstr ""
 "Ximian Evolution ha encontrado mensajes no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11684,47 +11581,47 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Firma"
-
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1317
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Firma"
+
+#: 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> archivo adjunto"
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
 
-#: 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 "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
 
-#: 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 "Redactar un mensaje"
 
-#: 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."
@@ -11732,7 +11629,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudo activar el control de selección de direcciones."
 
-#: 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"
@@ -11744,7 +11641,7 @@ msgstr ""
 "Asegúrese de que tiene la versión \n"
 "correcta de gtkhtml y libgtkthml instalada.\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."
@@ -11752,11 +11649,12 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudo activar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:4239
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
@@ -11909,16 +11807,12 @@ msgstr "Sincronizando categorías:"
 
 #. 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"
@@ -11970,31 +11864,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12075,6 +11961,11 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Selecciones una hora con la que comparar"
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Reglas para los _filtros</b>"
+
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Debe especificar un nombre de archivo."
@@ -12112,18 +12003,18 @@ 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:90
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
+#: 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 "Tareas pendientes"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Más tarde"
@@ -12173,42 +12064,22 @@ msgid "    "
 msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "<b>Filter Rules</b>"
-msgstr "<b>Reglas para los filtros</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>Virtual _Folders</b>"
-msgstr "<b>Carpetas _virtuales</b>"
-
-#: filter/filter.glade.h:4
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Reglas para los _filtros</b>"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>Fuentes de la carpeta virtual</b>"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Editar filtros"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Editar carpeta virtual"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrando"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Saliente"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12216,7 +12087,7 @@ msgstr ""
 "La fecha del mensaje será comparada contra las\n"
 "12:00am de la fecha especificada aquí."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12224,7 +12095,7 @@ msgstr ""
 "La fecha del mensaje será comparada con una\n"
 "fecha relativa al momento de ejecutar el filtro."
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12232,51 +12103,51 @@ msgstr ""
 "La fecha del mensaje será comparada con la\n"
 "fecha actual cuando el filtrado se realice."
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "una fecha relativa al momento actual"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "sólo carpetas especificadas"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "la fecha actual"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "Una fecha a especificar"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "con todas las carpetas remotas activas"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "con todas las carpetas locales y remotas activas"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "años"
 
@@ -12515,7 +12386,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: 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
@@ -12527,7 +12398,7 @@ msgid "Unset Status"
 msgstr "Sin estado"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "El nombre de la regla «%s» no es único, elija otro."
@@ -12544,8 +12415,9 @@ msgstr "Editar regla"
 msgid "Rule name"
 msgstr "Nombre de la regla"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Reglas de puntuación"
 
 #: filter/searchtypes.xml.h:1
@@ -12580,6 +12452,11 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Carpetas _virtuales</b>"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Debe dar un nombre a esta carpeta virtual."
@@ -12597,7 +12474,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -12638,8 +12516,8 @@ msgstr "Componente del visor de carpetas de correo de Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias de Evolution"
 
-#: 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 "Correo"
@@ -12652,49 +12530,46 @@ msgstr "Cuentas de correo"
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "No borrar"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:445
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Predeterminada]"
 
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
-#: 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 "Sin nombre"
 
-#: mail/em-composer-prefs.c:336
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Debe especificar un nombre de script válido."
 
-#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
-msgid "[script]"
-msgstr " [guión]"
-
-#: mail/em-composer-prefs.c:878
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: mail/em-composer-prefs.c:926
-msgid "Add script signature"
-msgstr "Añadir script de firma"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Añadir firma"
 
-#: mail/em-composer-prefs.c:946
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
@@ -12753,7 +12628,7 @@ msgstr ""
 "No se pudo abrir la carpeta de borradores para esta cuenta.\n"
 "¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una carpeta _virtual de la búsqueda..."
 
@@ -12787,7 +12662,7 @@ msgstr "<pulse aquí para seleccionar una carpeta>"
 msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: 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:"
@@ -12799,7 +12674,7 @@ msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
@@ -12816,118 +12691,119 @@ msgstr "Bandeja de entrada"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo carpeta %s"
 
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando carpeta %s"
 
-#: mail/em-folder-tree.c:883
+#: mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:885
+#: mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: mail/em-folder-tree.c:1947
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "No se pudo mover la carpeta: «%s»: Operación ilegal"
 
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: 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 "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2035
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "No se pudo borrar la carpeta: %s"
 
-#: mail/em-folder-tree.c:2361
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "No se pudo borrar la carpeta local %s."
 
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «%s» y todas sus subcarpetas?"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Borrar «%s»"
 
-#: mail/em-folder-tree.c:2411
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "No se pudo renombrar la carpeta local %s."
 
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+msgstr ""
+"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
 
-#: mail/em-folder-tree.c:2492 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 "_Ver"
 
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
@@ -13077,22 +12953,22 @@ msgstr "Imprimir mensaje"
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %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 "Coincide con: %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 "No firmado"
 
-#: 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."
@@ -13100,11 +12976,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: 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 "Firma válida"
 
-#: 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."
@@ -13112,11 +12988,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: 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 "Firma no válida"
 
-#: 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."
@@ -13124,11 +13000,11 @@ msgstr ""
 "La firma de este mensaje no puede ser verificada, pudo haber sido alterada "
 "en tránsito."
 
-#: 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 "Firma válida, ni se puede verificar el remitente"
 
-#: 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."
@@ -13136,11 +13012,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no pudo ser verificado."
 
-#: 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 "Descifrado"
 
-#: 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."
@@ -13148,11 +13024,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede ser visto en tránsito a "
 "través de 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 "Cifrado, débil"
 
-#: 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 "
@@ -13162,11 +13038,11 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: 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 "Cifrado"
 
-#: 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."
@@ -13174,11 +13050,11 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: 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 "Cifrado, fuerte"
 
-#: 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 "
@@ -13188,31 +13064,31 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Ocultar"
 
@@ -13221,92 +13097,92 @@ msgstr "_Ocultar"
 msgid "Page %d of %d"
 msgstr "Página %d de %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 "Obteniendo «%s»"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%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 "Puntero a archivo local (%s) valido en «%s»"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: mail/em-format-html.c:1406 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:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1406 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:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/em-format-html.c:1406 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:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/em-format-html.c:1406 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
+#: 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 "Cco"
 
 #. pseudo-header
-#: mail/em-format-html.c:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: 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:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
+#: 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 "Fecha"
 
-#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -13382,22 +13258,22 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: 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 "Falló  al migrar las cachés de identificación de usuario pop3 : %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 "Falló  al migrar el estado de expansión de la carpeta : %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 "Fallo al crear directorio  «%s»: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Fallo al abrir almacén para «%s»: %s"
@@ -13436,32 +13312,32 @@ msgstr "_Añadir a la libreta de direcciones"
 msgid "Open in %s..."
 msgstr "Abrir en %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 "Este almacén no soporta suscripciones, o no están activadas."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: 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 "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:831
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13470,25 +13346,25 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. 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 "El %a, %d-%m-%Y a las %H:%M, %%+05d, %%s escribió:"
 
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13497,7 +13373,7 @@ msgstr ""
 "No se pudo guardar en «%s»\n"
 "  %s"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13506,35 +13382,35 @@ msgstr ""
 "«%s» ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "mensaje"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Error: «%s» existe y no es un archivo normal"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Guardar mensaje..."
 
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
 
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No se pudo crear el directorio temporal: %s"
 
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13547,7 +13423,7 @@ msgstr ""
 "\n"
 "¿Quiere borrar realmente esos mensajes?"
 
-#: mail/em-utils.c:2477
+#: 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"
@@ -13616,48 +13492,58 @@ msgid "Default height of the Message Window"
 msgstr "Altura predeterminada de la ventana del mensaje"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Altura predeterminada de la ventana del mensaje"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: 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 "Anchura predeterminada de la ventana de mensajes"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: 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 "Vaciar todas las papeleras al salir de 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 "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Habilitar/deshabilitar modo cursor"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: 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 "
@@ -13668,31 +13554,32 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de Gnome puede usarse para "
 "mostrar el contenido."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Lista de cuentas conocidas para el componente de correo de Evolution. La "
-"lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/mail/accounts."
+"lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
+"mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si están activadas."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: 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."
@@ -13701,15 +13588,15 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: 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 - "
@@ -13719,181 +13606,193 @@ msgstr ""
 "Nunca cargar imágenes desde la red 1 - Cargar imágenes si el remitente está "
 "en la libreta de direcciones 2 - Siempre cargar imágenes desde la red"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista preliminar del mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la vista preliminar del mensaje."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Estilo del mensaje (normal, cabeceras completas, fuente)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "Archivo de sonido de notificación de correo nuevo"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Tipo de notificación de correo nuevo"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
 
-#: mail/evolution-mail.schemas.in.in.h:52
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: 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 "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacta"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellena el campo Cco"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Preguntar al mandar mensajes que sin destinatarios Para o Cc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intenta enviar HTML no deseado"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Ejecutar la prueba de spam en el correo entrante"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Mostrar imágenes animadas como animaciones."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar mensajes borrados (tachados) en la lista de mensajes."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensajes borrados en la lista de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr ""
+"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Altura predeterminada de la ventana de mensajes"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Anchura predeterminada de la ventana de mensaje"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La última vez que se vació la papelera, en días desde la época."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "La tipografía de terminal para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "La letra de anchura variable para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: 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;"
@@ -13905,99 +13804,99 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt; - establece activado si la cabecera "
 "se debe mostrar en la vista de correo."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Lista de mensajes por conversaciones."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Lista de mensajes por conversaciones"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "Conversaciones basadas en el asunto"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar un mensaje como visto"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar un mensaje como visto."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usar el demonio y cliente de Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Usar el demonio y cliente de Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar tipografía personalizada para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Usar sólo los tests de spam local."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sólo los tests de spam local (Sin DNS)"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "El elemento del menú «Ver/Cco» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "El elemento del menú «Ver/Cco» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "El elemento del menú «Ver/Cc» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "El elemento del menú «Ver/Cc» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "El elemento del menú «Ver/Desde» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "El elemento del menú «Ver/Desde» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "El elemento del menú «Ver/Publicar en» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "El elemento del menú «Ver/Publicar en» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "El elemento del menú «Ver/Responder a» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "El elemento del menú «Ver/Responder a» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: 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."
@@ -14005,11 +13904,11 @@ msgstr ""
 "Indica si se debe o no volver al hilado de conversaciones por asuntos cuando "
 "los mensajes no contienen cabeceras In-Reply-To o References"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "puerto para iniciar el spamd ejecutado por el usuario"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "puerto spamd"
 
@@ -14048,14 +13947,14 @@ msgstr "Evolution está importando su correo antiguo de Elm"
 #: 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 "Importando..."
 
 #: 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 "Por favor espere"
 
@@ -14100,12 +13999,12 @@ msgstr "Importando buzón de correo"
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro de prioridad «%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"
@@ -14131,7 +14030,7 @@ msgstr ""
 "lugar de prioridades. Verifique los filtros importados para asegurarse de\n"
 "que todo funciona como se espera."
 
-#: 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"
@@ -14143,7 +14042,7 @@ msgstr ""
 "que no están implementadas en Evolution.\n"
 "Estos filtros se desecharán."
 
-#: 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"
@@ -14157,23 +14056,23 @@ msgstr ""
 "en Evolution. Esos filtros serán modificados para probar\n"
 "si esa cadena está o no contenida en el cuerpo del mensaje."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando su información antigua de Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Importando datos de Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Configuración"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Filtros de correo"
 
-#: 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?"
@@ -14205,12 +14104,12 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:145
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
@@ -14226,7 +14125,7 @@ msgstr "_Nombre de usuario:"
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:2086
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
@@ -14259,11 +14158,11 @@ msgstr "Responde a %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "La(s) siguiente(s) regla(s) de filtrado:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14306,11 +14205,11 @@ msgstr "Crea una carpeta de correo nueva"
 msgid "URI of the mail source that the view will display"
 msgstr "URI de la fuente de correo que la vista mostrará"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identidad"
 
-#: 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 "
@@ -14320,12 +14219,12 @@ msgstr ""
 "«opcionales» no hace falta que los rellene,a menos que quiera incluir esta "
 "información en el correo-e que envíe."
 
-#: 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 "Recibiendo correo"
 
-#: 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."
@@ -14334,15 +14233,15 @@ msgstr ""
 "Si no está seguro, pregúntele a su administrador de sistemas o a su "
 "Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
-#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: 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."
@@ -14351,11 +14250,11 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: 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 "
@@ -14369,11 +14268,11 @@ msgstr ""
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo. Este "
 "nombre sólo se usará para mostrar información."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: 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 "Conectando al servidor..."
 
@@ -14631,7 +14530,8 @@ msgstr "No citar el mensaje original"
 
 #: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
 #: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
@@ -14990,7 +14890,7 @@ msgstr "descripción"
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14999,7 +14899,7 @@ msgstr ""
 "Error mientras «%s»':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15008,7 +14908,7 @@ msgstr ""
 "Error al efectuar operación:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Trabajando"
 
@@ -15212,68 +15112,68 @@ msgstr "<span weight=\"bold\">Cifrado</span>"
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ruta: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: 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 "Esperando..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "No se pudo guardar el archivo de firma:%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"
@@ -15283,23 +15183,23 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Editar firma"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Introduzca un nombre para esta firma."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -15327,17 +15227,17 @@ msgstr "Mensaje reenviado"
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta inválida: «%s»"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la URI: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15350,84 +15250,84 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual «%s» que no existe."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "La más alta"
 
-#: 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 "Hoy %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %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 "Generando la lista de mensajes"
 
@@ -15600,8 +15500,10 @@ msgstr ""
 "desarrollo de Evolution no se mostrará."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Path to the default calendar folder"
@@ -15718,7 +15620,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: 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 "Seleccione la información que quiera importar:"
 
@@ -15747,26 +15649,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar importador"
 
-#: 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 "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importando %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 cargando %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15775,31 +15677,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Nombre de archivo:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
-#: 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"
@@ -15807,25 +15709,25 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: 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 "De %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No hay importador disponible para el archivo «%s»"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "Imposible ejecutar importador"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importar"
 
@@ -15867,11 +15769,11 @@ msgstr "No se pudo abrir la carpeta compartida: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "No se pudo encontrar la carpeta compartida especificada."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
-#: 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 "
@@ -15891,7 +15793,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -15907,7 +15810,8 @@ msgstr "'.' y '..' son nombres reservados de carpetas."
 
 #: shell/e-shell-window-commands.c:63
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: shell/e-shell-window-commands.c:71
 #, c-format
@@ -15939,7 +15843,8 @@ msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution está conectado.  Pulse este botón para trabajar "
 "desconectado."
@@ -15949,7 +15854,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution está desconectado.  Pulse este botón para trabajar "
 "conectado."
@@ -15988,7 +15894,6 @@ msgstr "Casilla de verificación"
 
 #: 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 "Nuevo"
 
@@ -16042,16 +15947,17 @@ msgid "Create a new test item"
 msgstr "Crea una elemento de prueba nuevo"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Conexiones activas"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
+msgid "Active Connections"
+msgstr "Conexiones activas"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Las siguientes conexiones están actualmente activas:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16169,28 +16075,28 @@ msgstr ""
 "Con este asistente será guiado a través del proceso de\n"
 "importar archivos externos a Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importadores"
 
-#: 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 "Importar"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "No importar"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "No me preguntes más veces"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
 #. 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"
@@ -16227,7 +16133,7 @@ msgstr ""
 "\n"
 "esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16235,48 +16141,48 @@ msgstr ""
 "Gracias\n"
 "El equipo de Ximian Evolution\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "No preguntarme más veces"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No se pudo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la re-emigración desde Evolution 1.4"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depurado de todos los componente a un archivo."
 
-#: 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"
@@ -16508,7 +16414,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene certificados en el archivo que identifican a estas autoridades de "
 "certificación:"
@@ -16793,7 +16700,7 @@ msgstr "Mover contact(os) a otra carpeta..."
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: 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 "Pega el contenido del porta papeles"
 
@@ -16803,7 +16710,7 @@ msgstr "Previsualiza los contactos a imprimir"
 
 #: 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 "Pre_visualizar la impresión"
 
@@ -16851,13 +16758,13 @@ msgstr "Parar la carga"
 msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
-#: 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 "A_cciones"
 
@@ -16878,14 +16785,10 @@ msgid "_Save as VCard"
 msgstr "G_uardar como vCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "Bu_scar contactos"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Enviar _mensaje al contacto..."
 
@@ -16893,58 +16796,54 @@ msgstr "Enviar _mensaje al contacto..."
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Borrar todas las repeticiones"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Borrar la cita"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Borrar esta repetición"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Borrar esta repetición"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Volver"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Avanzar"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Ir a una _fecha"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Ir a una fecha específica"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Ir a hoy"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Siguiente"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza la agenda a imprimir"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Anterior"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Imprime esta agenda"
@@ -16953,7 +16852,7 @@ msgstr "Imprime esta agenda"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publica información de disponibilidad para esta agenda"
 
-#: 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_ar"
 
@@ -16962,34 +16861,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Purgar reuniones y eventos antiguos"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Seleccionar nombres"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Ir a una fecha específica"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Seleccionar carpeta"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Mostrar como lista"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Mostrar la semana laboral"
 
-#: 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 "Hoy"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Ver la cita actual"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
@@ -17183,7 +17102,8 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -17242,8 +17162,10 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -17527,10 +17449,6 @@ msgstr "Mover"
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensaje(s) seleccionado(s) a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Siguiente"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Mensaje _importante siguiente"
@@ -17579,10 +17497,6 @@ msgstr "Mensaje importante an_terior"
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a ser impreso"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Anterior"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
@@ -17993,39 +17907,39 @@ msgstr "Copia las tareas seleccionadas"
 msgid "Cut selected task"
 msgstr "Corta las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Borra las tareas terminadas"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Borra las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Marcar como terminado"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Marcar tareas seleccionadas como terminadas"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Pega la tarea del portapapeles"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Vista previa de la lista de tareas a imprimir"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Imprime la lista de tareas"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Ver la tarea seleccionada"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Abrir tarea"
 
@@ -18154,10 +18068,15 @@ msgid "_Day View"
 msgstr "Vista _diaria"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Vista de lista"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Vista _mensual"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Vista de la semana _laboral"
 
@@ -18186,10 +18105,16 @@ msgid "_Messages"
 msgstr "_Mensajes"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Con _categoría"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Fecha de vencimiento:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Poner estado"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tareas"
 
@@ -18252,10 +18177,6 @@ msgstr "%B %Y"
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Hoy"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18265,82 +18186,87 @@ msgstr "La fecha debe estar en el formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Báltico"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Centroeuropeo"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Chino"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Griego"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japonés"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turco"
 
-#: 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 "Europeo occidental"
 
-#: 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 "Europeo occidental"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "tradicional"
 
-#: 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 "simplificado"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: 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 "Conjunto de caracteres desconocido: %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 "Codificación de caracteres"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Introduzca conjunto de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Otro..."
 
@@ -18404,6 +18330,11 @@ msgstr "Indicador de espacio"
 msgid "Spacing around expander arrow"
 msgstr "Espaciado alrededor de la flecha del expansor"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Buscar"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Editor de búsquedas"
@@ -18467,15 +18398,128 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Fuentes de la libreta de direcciones"
+
+#~ msgid "Selected:"
+#~ msgstr "Seleccionado:"
+
+#~ msgid "Go To Date"
+#~ msgstr "Ir a una fecha"
+
+#~ msgid "_Go To Today"
+#~ msgstr "_Ir a hoy"
+
+#~ msgid "Unexpected response from IMAP server %s: %s"
+#~ msgstr "Respuesta inesperada del servidor IMAP %s: %s"
+
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "No se pudo seleccionar la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
+
+#~ msgid "Got BYE response"
+#~ msgstr "Se obtuvo una respuesta BYE"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Falló al conectar al servidor IMAP %s en modo seguro: El servidor no "
+#~ "soporta STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
+#~ "autenticación %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%s Escriba la contraseña IMAP para %s en el host %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
+
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr "No se pudo crear la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
+
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Etiqueta inesperada en la respuesta del servidor IMAP %s:"
+
+#~ msgid "No data"
+#~ msgstr "Sin datos"
+
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "<b>Reglas para los filtros</b>"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Editar filtros"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Editar carpeta virtual"
+
+#~ msgid "Outgoing"
+#~ msgstr "Saliente"
+
+#~ msgid "[script]"
+#~ msgstr " [guión]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Añadir script de firma"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Las siguientes conexiones están actualmente activas:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "Bu_scar contactos"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Ir a una _fecha"
+
+#~ msgid "Go to today"
+#~ msgstr "Ir a hoy"
+
+#~ msgid "With _Category"
+#~ msgstr "Con _categoría"
+
 #~ msgid "1 contact"
 #~ msgstr "1 contacto"
 
 #~ msgid "and %d other contacts."
 #~ msgstr "y otros %d contactos."
 
-#~ msgid "List View"
-#~ msgstr "Vista de lista"
-
 #~ msgid "1 day"
 #~ msgstr "1 día"
 
@@ -19093,9 +19137,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "Editar servidor LDAP"
 
-#~ msgid "Select Names"
-#~ msgstr "Seleccionar nombres"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Contactos seleccionados:"
 
@@ -29064,4 +29105,3 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
-
diff --git a/po/et.po b/po/et.po
index 5ede24e6fe..eada880fe7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.4.5\n"
-"POT-Creation-Date: 2004-02-27 03:15+0100\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-27 16:12+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -21,6 +21,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Evolution'i aadressiraamat"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "koos kõigi kohalike kalatoogidega"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Salvesta kui"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kaardid"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "kaardid"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktid:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution'i alarm "
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
@@ -55,6 +96,10 @@ msgstr "_Salvesta värv siia"
 #  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
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:363
@@ -107,100 +152,110 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: 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
-#: ui/evolution-contact-list-editor.xml.h:3
-#: ui/evolution-mail-message.xml.h:24
+#: 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 "Kustuta"
 
-#: 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 "Omadused..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Loo uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Loo uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Uus aadressiraamat"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Aadressiraamat"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Lisab uue ülesande"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "VIGA: info pole veel saadaval"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:128
-#: mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:65
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:175
-#: mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -209,28 +264,26 @@ msgstr "Siirdamine `%s':"
 #  On This Computer is always first and VFolders is always last
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
+#. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426
-#: calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:192
-#: mail/em-folder-tree-model.c:194
+#: 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 "Selles arvutis"
 
 #  Create the default Person addressbook
 #  orange
+#. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434
-#: calendar/gui/migration.c:511
-#: filter/filter-label.c:123
-#: mail/em-migrate.c:925
-#: mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Isiklik"
 
 #  Create the LDAP source group
+#. Create the LDAP source group
 #: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
@@ -272,62 +325,71 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
-msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
 msgstr ""
 "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee\n"
 "on õige ja kas sul on sellele vajalikud ligipääsuõigused."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 "Aadressiraamatu avamine nurjus. Põhjuseks võib\n"
 "olla see, et sisestasid vigase URI või kasutatav LDAP server\n"
 "ei ole kättesaadav."
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
-msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution you must compile the program from the CVS sources after retrieving OpenLDAP from the link below."
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
 msgstr ""
 "Käesolev Evolution'i versioon ei ole kompileeritud LDAP\n"
 "toega. Kui sa soovid Evolution'i koos LDAP'i toega, pead\n"
 "ise Evolution'i lähtetekstidest kokku kompileerima.\n"
 "Eelnevalt laadi OpenLDAP alljärgneva viida abil.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
 msgstr ""
 "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võib\n"
 "olla see, et sisestasid vale URI või kasutatav server\n"
 "ei ole kättesaadav."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine ebaõnnestus"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 #, fuzzy
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga..."
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Autentimine ebaõnnestus.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, mida kalender näitab"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "URI, mida kaustalehitseja näitab"
@@ -341,7 +403,9 @@ msgid "Position of the vertical pane in main view"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid "The number of characters that must be typed before evolution will attempt to autocomplete"
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
@@ -349,17 +413,11 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Mitte toetatud protokoll"
 
-#: 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
@@ -374,62 +432,51 @@ msgstr "Mitte toetatud protokoll"
 #: 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
-#: mail/mail-search.glade.h:1
-#: mail/message-tags.glade.h:1
+#: 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 "Aadressiraamatu loomise assistent"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Aadressiraamatu allikad"
-
-#: 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 "Alati"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
-#: 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"
@@ -437,163 +484,181 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Ühendamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "_Eraldusnimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "E-posti aadress: "
 
-#: 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 esitab selle eraldusnime serverile audentsuse kontrollil"
 
 # !PARANDA! - sõnasus on kuidagi mäda
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
+#: addressbook/gui/component/ldap-config.glade.h:20
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
 
-#: 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 "Lõpetatud"
 
-#: 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 "Üldine"
 
-#: 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 "Grupp:"
 
-#: 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 "Mitte kunagi"
 
-#: 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"
-"and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses these protocols."
-msgstr ""
-"Nüüd pead määrama viisi, kuidas sa tahad ühendada LDAP serverisse. SSL(Secure Sockets Layer)\n"
-"ja TLS (Transport Layer Security) protokolle kasutatakse osade serverite pooltsinu ühenduse krüptograafiliseks kaitseks. \n"
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+"Nüüd pead määrama viisi, kuidas sa tahad ühendada LDAP serverisse. SSL"
+"(Secure Sockets Layer)\n"
+"ja TLS (Transport Layer Security) protokolle kasutatakse osade serverite "
+"pooltsinu ühenduse krüptograafiliseks kaitseks. \n"
 "Küsi oma süsteemiülemalt, kas sinu LDAP server kasutab neid protokolle."
 
 # !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Üks"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Otsingu _kehtivuspiirkond: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Otsin"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Valitud:"
-
-#: 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"
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection is already\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
-"Selecting this option means that your server does not support either SSL or TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable to security\n"
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
-"Selecting this option will let you change Evolution's default settings for LDAP\n"
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "1. samm: Kausta omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "2. samm: Serveri informatsioon"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "3. samm: Serveriga ühendamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "4. samm: Kausta otsimine"
 
 # !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Alam"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Otsi faile"
 
-#: 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"
-"searches, and how long a search should take. Ask your system administrator if you\n"
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
 "need to change these options."
 msgstr ""
-"Valikud sellel lehel määravad, kui palju kirjeid peaks olema lisatud sinuotsingutele\n"
-"ja kui kaua otsing võib kesta. Kui pead vajalikuks nende parameetrite muutmist,\n"
+"Valikud sellel lehel määravad, kui palju kirjeid peaks olema lisatud "
+"sinuotsingutele\n"
+"ja kui kaua otsing võib kesta. Kui pead vajalikuks nende parameetrite "
+"muutmist,\n"
 "siis küsi abi oma süsteemiülemalt."
 
-#: 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"
-"begin. If you leave this blank, the search will begin at the root of the directory tree."
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
-"The search scope defines how deep you would like the search to extend down the \n"
-"directory tree. A search scope of \"sub\" will include all entries below your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath your base.\n"
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -610,35 +675,50 @@ msgstr ""
 " kohta. Kui vajad selle info leidmisel abi, siis palun kontakteeru oma\n"
 "süsteemiadministraatoriga."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: 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"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
-msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
-msgstr "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri toetama anonüümset ligipääsu."
+#: addressbook/gui/component/ldap-config.glade.h:70
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
+"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
+"toetama anonüümset ligipääsu."
 
-#: 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"
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
-msgid "This is the name that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult näitamiseks."
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
+"näitamiseks."
 
-#: 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"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -646,98 +726,84 @@ msgstr ""
 "Nimekiri standardportidest on väljatoodud. Küsi oma süsteemiülemalt\n"
 "millise pordi sa peaksid määrama."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "_Kasuta SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: 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 "Kui võimalik"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 #, fuzzy
 msgid ""
-"You have decided to configure an LDAP server. The first step in doing this is to provide its name and your\n"
-"log in information. Please ask your system administrator if you are unsure of this information."
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
 msgstr ""
-"Esimene samm LDAP serveri seadistamisel on serveri nimi ja sinu sisselogimiseinformatsioon.\n"
+"Esimene samm LDAP serveri seadistamisel on serveri nimi ja sinu "
+"sisselogimiseinformatsioon.\n"
 " Kui sa neid ei tea, siis küsi abi oma süsteemiadministraatorilt. "
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
-msgstr "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
+msgstr ""
+"  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: 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:17
-#: 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 "_Redaktor"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Sisselogimismeetod"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Pordi number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Otsingu baas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Taimaut (minutites):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kaardid"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Uus s_akk"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "üldine-sakk"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "otsingu-sakk"
 
@@ -772,7 +838,7 @@ msgid "Send HTML Mail?"
 msgstr "Saata HTML sõnum?"
 
 #: 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 "Lisa kontaktide hulka"
 
@@ -788,7 +854,7 @@ msgstr "Nimi"
 
 #: 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 "Allikas"
 
@@ -861,7 +927,8 @@ msgstr "Koostöö"
 
 #. 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 "Kontaktiredaktor"
 
@@ -870,8 +937,7 @@ msgid "D_epartment:"
 msgstr "_Oskaond:"
 
 #: 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 "Täpsustused"
@@ -895,14 +961,17 @@ msgstr "T_äisnimi..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #, fuzzy
-msgid "If this person has the ability to participate in a video conference, enter their address here."
+msgid ""
+"If this person has the ability to participate in a video conference, enter "
+"their address here."
 msgstr ""
 "Kui see isik kajastab oma ajakava või muud kalendriinfot Internetis,\n"
 "sisesta siia aadressid, kust seda infot leida võib. "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
-"If this person publishes free/busy or other calendar information on the Internet, enter the address\n"
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
 "of that information here."
 msgstr ""
 "Kui see isik kajastab oma ajakava või muud kalendriinfot Internetis,\n"
@@ -954,23 +1023,29 @@ msgid "_Categories..."
 msgstr "_Kategooriad:"
 
 #  FIXME: need to disable for undeletable folders
+#. 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-calendar-view.c:1332
-#: calendar/gui/e-calendar-view.c:1363
-#: calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075
-#: mail/em-folder-tree.c:2504
-#: mail/em-folder-view.c:765
-#: 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/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 "_Kustuta"
 
+#: 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 "_Redaktor"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Kodu:"
@@ -1023,9 +1098,9 @@ msgstr "Aadress"
 #: 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
@@ -2012,7 +2087,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"
@@ -2028,21 +2103,22 @@ 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
 #, fuzzy
 msgid "Service"
 msgstr "Teenus"
 
 #: 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 "Asukoht"
 
@@ -2051,118 +2127,101 @@ msgid "Username"
 msgstr "Kasutajanimi"
 
 #: 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 "Kodu"
 
 #  red
+#. 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 "Töö"
 
 #: 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 "Muu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Aadressraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 #, fuzzy
 msgid "Target Book"
 msgstr "Aadressraamat"
 
-#: 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:180
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Loo uus kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Sertifikaadi _väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 #, fuzzy
 msgid "Changed"
 msgstr "Parool on nüüd muudetud\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Konto nimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: 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 "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Kontakti salvestamine VKaardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada need kontaktid?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Äri"
 
-#: 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 "Ei leidnud vidinat väljale: `%s'"
@@ -2176,6 +2235,7 @@ msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Täisnimi:"
 
@@ -2183,6 +2243,22 @@ msgstr "_Täisnimi:"
 msgid "E-_mail:"
 msgstr "E-Post:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
@@ -2304,6 +2380,10 @@ msgstr "Teenuse kontrollimine"
 msgid "_Location:"
 msgstr "_Asukoht:"
 
+#: 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 "Liikmed"
@@ -2326,26 +2406,27 @@ msgstr "Kirjuta e-posti aadress või tiri kontakt allolevasse loendisse:"
 msgid "contact-list-editor"
 msgstr "kontaktide-nimekirja-redaktor"
 
-#: 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 "Raamat"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #, fuzzy
 msgid "Is New List"
 msgstr "Uus kontaktide nimekiri"
 
 #. 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 "Kontaktiloendi redaktor"
 
-#: 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 "Salvesta nimekiri VKaardina"
 
@@ -2397,23 +2478,21 @@ msgid "No contacts"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d kontakti"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakti"
+msgstr[1] "%d kontakti"
 
-#: 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 "Päring"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 #, fuzzy
 msgid "Error getting book view"
 msgstr "viga informatsiooni saamisel '%s' jaoks: %s"
@@ -2426,134 +2505,128 @@ msgstr "Mudel"
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Nimi algab stringiga"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "E-post algab stringiga"
 
-#: 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 "Kategooria on"
 
 #. 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 "Suvaline väli sisaldab"
 
-#: 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 "Edasijõudnutele..."
 
-#: 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-meeting-list-view.c:340
+#: 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 "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Mine kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Otsi kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilot pihuarvuti sätted..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-#: calendar/gui/print.c:2480
-#: 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 "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Liiguta aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/tasks-component.c:363
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9
+#: 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 "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: 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 "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Käesolev vaade"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2562,7 +2635,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Suvaline kategooria"
@@ -2596,8 +2669,6 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: 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 "Kategooriad"
 
@@ -2606,8 +2677,7 @@ msgid "Company Phone"
 msgstr "Firma telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:522
-#: smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2703,7 +2773,7 @@ msgstr "Raadio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:347
+#: calendar/gui/e-meeting-list-view.c:256
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
@@ -2883,125 +2953,119 @@ msgstr "Ameti_nimetus:"
 msgid "Home page"
 msgstr "Alguskülg"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Õnnestus"
 
-#: 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
-#: camel/providers/pop3/camel-pop3-store.c:545
-#: shell/e-shell.c:1071
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Ei leia faili"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Fail %s on juba olemas. Kas kirjutada üle?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
-#: 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: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
+#: 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: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 "Katkestatud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Autentimine ebaõnnestus."
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "TLS not Available"
 msgstr "Teenus ei ole kättesaadav"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Partitsiooni %d pole veel olemas!\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 #, fuzzy
 msgid "_Discard"
 msgstr "Keeldu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: 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
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: 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
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3010,30 +3074,30 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Viga %s salvestamisel: %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 "kaart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Tõsta prügikasti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr ""
@@ -3041,26 +3105,26 @@ msgstr ""
 "Koopia aadressile:\n"
 "  "
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Lisa kontaktide hulka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Lisa kontaktide hulka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Salvesta aadressiraamatusse"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
@@ -3097,36 +3161,33 @@ msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 msgid "Querying Address Book..."
 msgstr "GNOME aadressraamat"
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Muuda kontakti andmeid"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "Lisa kontaktide hulka"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "Kõik _inimesed ja üks ressurss"
+msgid_plural "and %d other contacts."
+msgstr[0] "Kõik _inimesed ja üks ressurss"
+msgstr[1] "Kõik _inimesed ja üks ressurss"
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Näita kõiki _päiseid"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
@@ -3138,18 +3199,18 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 #, fuzzy
 msgid "Reflow Test"
 msgstr "Html 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 "Autoriõigus (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 ""
 
@@ -3280,7 +3341,6 @@ msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
-#: mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Häälestus"
 
@@ -3419,7 +3479,8 @@ msgid "Export in asynchronous mode "
 msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3427,7 +3488,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3464,9 +3526,8 @@ msgstr "Puudub salvestatava faili nimi"
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
-#: calendar/common/authentication.c:37
-#: calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
 
@@ -3552,10 +3613,8 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution component for handling contacts."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1138
-#: calendar/gui/print.c:1819
-#: calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
+#: 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"
 msgstr "Ülesanded"
@@ -3583,8 +3642,7 @@ msgid "Alarm on %s"
 msgstr "Alarm %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
@@ -3628,12 +3686,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
-#: calendar/gui/alarm-notify/alarm-queue.c:1109
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: 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"
@@ -3645,10 +3703,11 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1115
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3661,7 +3720,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr "Ära selle programmi kohta enam küsi."
 
@@ -3677,8 +3736,7 @@ msgstr "Ei saa gnome-vfs initsialiseerida"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37
-#: calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "vigane aeg"
 
@@ -3841,23 +3899,25 @@ msgstr "Kommentaar sisaldab"
 msgid "Location contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:363
-#: mail/mail-ops.c:1059
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-commands.c:116
-#: calendar/gui/gnome-cal.c:1585
-#: 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 "Kalender"
 
 #: calendar/gui/calendar-commands.c:351
 #, fuzzy
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
 msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+"enam võimalik taastada.\n"
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
@@ -3867,8 +3927,7 @@ msgid "Purge events older than"
 msgstr "on väiksem kui"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "päeva"
 
@@ -3878,27 +3937,18 @@ 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:1589
-#: calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:436
-#: calendar/gui/calendar-commands.c:441
+#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
 #: calendar/gui/calendar-commands.c:443
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:460
-#: calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472
-#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
+#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
@@ -3906,75 +3956,74 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:464
-#: calendar/gui/e-week-view-main-item.c:337
-#: calendar/gui/print.c:1498
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Kokkusaamine"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Lisab uue kokkusaamise"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav kohtumine"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Kogu _päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava kokkusaamise"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Loo uus kalender"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4004,10 +4053,6 @@ msgstr "Nädala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Loeteluvaade"
-
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4027,16 +4072,16 @@ msgstr "Juurdepääs keelatud"
 msgid "open_client(): %s"
 msgstr "Võrk, mina olen kliendiks"
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ei saa avada kausta '%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI, mida kalender näitab"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Vaate tüüp näitamiseks"
 
@@ -4095,8 +4140,7 @@ msgstr "Saaja"
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "dialog1"
 msgstr "dialog1"
@@ -4105,13 +4149,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "minutit"
 
@@ -4135,13 +4177,11 @@ msgstr "Põhilised asjad"
 msgid "Date/Time:"
 msgstr "Kuupäev ja kell:"
 
-#: 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 "Näita teadet"
 
-#: 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 "Mängi heli"
 
@@ -4149,20 +4189,17 @@ msgstr "Mängi heli"
 msgid "Reminders"
 msgstr "Meeldetuletajad"
 
-#: 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 "Käivita programm"
 
-#: 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 "Saada sõnum"
 
 #: 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 "Kokkuvõte:"
@@ -4194,7 +4231,6 @@ msgstr "tund(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
 #: calendar/gui/dialogs/calendar-setup.glade.h:40
-#: mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -4204,10 +4240,10 @@ msgstr "kokkusaamise algust"
 
 #  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:493
-#: mail/em-composer-prefs.c:712
-#: mail/em-composer-prefs.c:876
+#. 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:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 #, fuzzy
 msgid "Enabled"
 msgstr "lubatud"
@@ -4224,25 +4260,19 @@ msgstr "Eemalda filter"
 
 #: 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: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: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 "Keela"
 
 #: 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:401
-#: 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 "Luba"
 
@@ -4267,7 +4297,6 @@ msgid "60 minutes"
 msgstr "60 minutit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4292,7 +4321,7 @@ msgid "Days"
 msgstr "Päev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "E_nable"
 msgstr "Luba _Lülitavad Klahvid"
@@ -4388,7 +4417,7 @@ msgid "Wednesday"
 msgstr "Kolmapäev"
 
 #: 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 "Töönädal"
 
@@ -4435,7 +4464,6 @@ msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Üldine"
 
@@ -4498,7 +4526,9 @@ msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.c:229
 #, c-format
-msgid "The group '%s' is remote. You must specify a location to get the calendar from"
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
@@ -4526,7 +4556,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
@@ -4537,11 +4567,15 @@ msgid "Remote"
 msgstr "Kau_g: "
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "Specifying a display name and group is the first step in setting up a calendar."
+msgid ""
+"Specifying a display name and group is the first step in setting up a "
+"calendar."
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:19
-msgid "Specifying a display name and group is the first step in setting up a task list."
+msgid ""
+"Specifying a display name and group is the first step in setting up a task "
+"list."
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:21
@@ -4592,7 +4626,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:35
 msgid ""
-"You're creating a folder in a group that's stored in a remote location. This requires you\n"
+"You're creating a folder in a group that's stored in a remote location. This "
+"requires you\n"
 "to specify additional parameters."
 msgstr ""
 
@@ -4607,24 +4642,36 @@ msgid "_Source URL:"
 msgstr "Ava URL: %s"
 
 #: calendar/gui/dialogs/cancel-comp.c:57
-msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
-msgstr "Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele teate koosoleku ärajätmise kohta?"
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
+"Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele teate "
+"koosoleku ärajätmise kohta?"
 
 #: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud koosoleku?"
 
 #: calendar/gui/dialogs/cancel-comp.c:66
-msgid "The task being deleted is assigned, would you like to send a cancellation notice?"
-msgstr "Ülesanne, mida te kustutate, on antud täitmiseks. Kas soovite saata tühistamise teate?"
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+"Ülesanne, mida te kustutate, on antud täitmiseks. Kas soovite saata "
+"tühistamise teate?"
 
 #: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud ülesande?"
 
 #: calendar/gui/dialogs/cancel-comp.c:75
-msgid "The journal entry being deleted is published, would you like to send a cancellation notice?"
-msgstr "Päevaraamatu sissekanne, mida te kustutate on avalik. Kas soovite saata ärajätmise teate?"
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+"Päevaraamatu sissekanne, mida te kustutate on avalik. Kas soovite saata "
+"ärajätmise teate?"
 
 #: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4645,7 +4692,8 @@ msgstr "Antud päeviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
+msgstr ""
+"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
 #: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -4667,7 +4715,9 @@ msgstr "Antud päeviku sissekannet on muudetud."
 #: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada redaktorit?"
+msgstr ""
+"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
+"redaktorit?"
 
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -4679,28 +4729,23 @@ msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr " kuni "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Tähtaeg "
 
@@ -4737,9 +4782,8 @@ msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
 #: calendar/gui/dialogs/comp-editor.c:1360
-#: calendar/gui/e-calendar-view.c:1057
-#: calendar/gui/e-calendar-table.c:1190
-#: composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
@@ -4754,17 +4798,17 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Kasuta käesolevat valikut nimede tekitamisel"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:58
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "%s: Ei saa järjekorda (FIFO) avada"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:66
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "%s: Ei saa järjekorda (FIFO) avada"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:75
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 #, fuzzy
 msgid "Destination is read only"
 msgstr "Sihtkoha ketas on kirjutuskaitsega."
@@ -4797,19 +4841,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Kas sa tõesti soovid kustutada seda nimetut päeviku sissekannet?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Kas sa tõesti soovid kustutada %d sündmust?"
+#, 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] "Kas sa tõesti soovid kustutada %d sündmust?"
+msgstr[1] "Kas sa tõesti soovid kustutada %d sündmust?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Kas sa tõesti soovid kustutada %d ülesannet?"
+#: 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] "Kas sa tõesti soovid kustutada %d ülesannet?"
+msgstr[1] "Kas sa tõesti soovid kustutada %d ülesannet?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Kas sa tõesti soovid kustutada %d päeviku sissekannet?"
+#: 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] "Kas sa tõesti soovid kustutada %d päeviku sissekannet?"
+msgstr[1] "Kas sa tõesti soovid kustutada %d päeviku sissekannet?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4875,8 +4925,7 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:200
-#: calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
@@ -4896,8 +4945,7 @@ msgstr "Planeering"
 
 #: calendar/gui/dialogs/event-editor.c:228
 #: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441
-#: ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Koosolek"
 
@@ -4909,8 +4957,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:615
-#: calendar/gui/dialogs/task-page.c:512
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Lõppemise päev on vale"
@@ -4952,8 +4999,6 @@ msgstr "Kalender"
 
 #: 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 "Liigitamine"
 
@@ -5002,25 +5047,15 @@ msgid "_Start time:"
 msgstr "_Algus:"
 
 #. 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:454
-#: mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1310
-#: mail/mail-account-gui.c:1838
-#: 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:443
-#: widgets/misc/e-dateedit.c:1480
-#: widgets/misc/e-dateedit.c:1595
+#: 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 "Puudub"
 
@@ -5041,7 +5076,7 @@ msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:331
+#: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osavõtja"
@@ -5077,17 +5112,15 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-meeting-list-view.c:354
+#: 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-meeting-list-view.c:361
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
-#: filter/libfilter-i18n.h:62
+#: 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
 msgid "Status"
 msgstr "Olek"
@@ -5165,7 +5198,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -5269,7 +5303,7 @@ msgid "_No recurrence"
 msgstr "E_i kordu"
 
 #: 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 "_Eemalda"
 
@@ -5312,8 +5346,7 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: 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
 #, fuzzy
 msgid "_Discard Changes"
 msgstr "Salvesta muudatused"
@@ -5322,6 +5355,28 @@ msgstr "Salvesta muudatused"
 msgid "Save Event"
 msgstr "Salvesta sündmus"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Vali maatr_iks"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Vigane sihtkoht"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Uus ülesannete nimekiri"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Koosoleku info on valmis. Kas soovid selle laiali saata?"
@@ -5349,53 +5404,41 @@ msgid "% _Complete"
 msgstr "(%) _valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: 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/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:2346
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: 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
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
+#: mail/message-list.c:947
 msgid "High"
 msgstr "Kõrge"
 
 #: 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:2343
+#: 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:2343
 msgid "In Progress"
 msgstr "Töös"
 
 #: 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
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:864
-#: 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 "Keskmine"
 
 #: 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/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:2340
 msgid "Not Started"
 msgstr "Pole alanud"
@@ -5441,8 +5484,7 @@ msgstr "Kellele määratud"
 msgid "Due date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/task-page.c:545
-#: calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 #, fuzzy
 msgid "Due date is before start date!"
@@ -5457,12 +5499,9 @@ msgstr "Ei saa avada mooduli faili \"%s\"."
 msgid "Con_fidential"
 msgstr "_Salajane"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-itip-control.c:993
-#: 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
+#: 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:69
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5533,145 +5572,118 @@ msgid "Weekly"
 msgstr "Iganädalane"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d päeva"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 päev"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d nädalat"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 nädal"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d tundi"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 tund"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d päeva"
+msgstr[1] "%d päeva"
 
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutit"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d nädalat"
+msgstr[1] "%d nädalat"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minut"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tundi"
+msgstr[1] "%d tundi"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundit"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutit"
+msgstr[1] "%d minutit"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekund"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundit"
+msgstr[1] "%d sekundit"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
-#: 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 enne kokkusaamise algust"
 
-#: 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 pärast kokkusaamise algust"
 
-#: 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 kokkusaamise alguses"
 
-#: 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 enne kokkusaamise lõppu"
 
-#: 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 pärast kokkusaamise lõppu"
 
-#: 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 kokkusaamise lõpus"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s @ %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 tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-list-view.c:264
-#: calendar/gui/e-cal-model.c:312
-#: calendar/gui/e-cal-model.c:319
-#: 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 "Avalik"
 
-#: calendar/gui/e-cal-list-view.c:265
-#: calendar/gui/e-cal-model.c:321
+#: 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 "Isiklik"
 
-#: calendar/gui/e-cal-list-view.c:266
-#: calendar/gui/e-cal-model.c:323
+#: 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 "Salajane"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Kirjeldus"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Kuupäev"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Algab kuupäeval"
 
-#: 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 "Kokkuvõte"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: mail/mail-config.glade.h:180
-msgid "color"
-msgstr "värv"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "komponent"
-
-#: calendar/gui/e-cal-model-calendar.c:163
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Kinni"
@@ -5684,8 +5696,7 @@ msgstr "Põ"
 msgid "S"
 msgstr "Lõ"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-#: smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Ida"
 
@@ -5703,200 +5714,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966
-#: calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:259
-#: calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169
-#: calendar/gui/e-meeting-store.c:765
+#: 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 "Jah"
 
-#: calendar/gui/e-cal-model-tasks.c:966
-#: calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:260
-#: calendar/gui/e-meeting-store.c:171
+#: 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 "Ei"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-cal-model.c:328
-#: calendar/gui/e-itip-control.c:978
-#: calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-list-view.c:249
-#: 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
+#: 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:2130
-#: 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 "Tundmatu"
 
-#: calendar/gui/e-cal-model.c:866
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/e-cal-model.c:868
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-calendar-view.c:677
-#: calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Kustutan valitud objektid"
-
-#: calendar/gui/e-calendar-view.c:778
-#: calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Objektide uuendamine"
-
-#: calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1371
-msgid "New _Appointment..."
-msgstr "Uus _kokkusaamine..."
-
-#: calendar/gui/e-calendar-view.c:1285
-#: calendar/gui/e-calendar-view.c:1373
-msgid "New All Day _Event"
-msgstr "Uus kogu päeva _sündmus"
-
-#: calendar/gui/e-calendar-view.c:1286
-#: calendar/gui/e-calendar-view.c:1375
-msgid "New Meeting"
-msgstr "Uus koosolek"
-
-#: calendar/gui/e-calendar-view.c:1287
-#: calendar/gui/e-calendar-view.c:1377
-msgid "New Task"
-msgstr "Uus ülesanne"
-
-#: calendar/gui/e-calendar-view.c:1291
-#: calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-view.c:1383
-#: 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 "_Trüki..."
-
-#: calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1321
-#: calendar/gui/e-calendar-view.c:1381
-#: 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 "_Aseta"
-
-#: calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1367
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Mine tänasele _päevale"
-
-#: calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1369
-msgid "_Go to Date..."
-msgstr "_Mine kuupäevale..."
-
-#: calendar/gui/e-calendar-view.c:1306
-#: ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Publitseeri vaba/hõivatud infot"
-
-#: calendar/gui/e-calendar-view.c:1312
-#: calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:740
-#: ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "A_va"
-
-#: calendar/gui/e-calendar-view.c:1313
-#: calendar/gui/e-calendar-view.c:1385
-#: calendar/gui/e-calendar-table.c:1039
-#: calendar/gui/e-calendar-table.c:1084
-#: 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 "_Salvesta kui..."
-
-#: calendar/gui/e-calendar-view.c:1319
-#: calendar/gui/e-calendar-view.c:1361
-#: 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 "_Lõika"
-
-#: calendar/gui/e-calendar-view.c:1320
-#: calendar/gui/e-calendar-view.c:1359
-#: calendar/gui/e-calendar-table.c:1045
-#: calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2497
-#: 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 "_Kopeeri"
-
-#: calendar/gui/e-calendar-view.c:1325
-#, fuzzy
-msgid "Cop_y to Calendar..."
-msgstr "Trükitava kalendri eelvaatlemine"
-
-#: calendar/gui/e-calendar-view.c:1326
-#, fuzzy
-msgid "Mo_ve to Calendar..."
-msgstr "_Tõsta prügikasti"
-
-#: calendar/gui/e-calendar-view.c:1327
-msgid "_Schedule Meeting..."
-msgstr "_Ajasta koosolek..."
-
-#: calendar/gui/e-calendar-view.c:1328
-msgid "_Forward as iCalendar..."
-msgstr "Edasta i_Kalendrina"
-
-#: calendar/gui/e-calendar-view.c:1333
-#: calendar/gui/e-calendar-view.c:1364
-msgid "Delete this _Occurrence"
-msgstr "Ku_stuta see sündmus"
-
-#: calendar/gui/e-calendar-view.c:1334
-#: calendar/gui/e-calendar-view.c:1365
-msgid "Delete _All Occurrences"
-msgstr "Kustuta k_õik sündmused"
-
-#: calendar/gui/e-calendar-view.c:1387
-#: ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Sätted..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5941,33 +5791,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 "Kustutan valitud objektid"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Objektide uuendamine"
+
+#: 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 "A_va"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "_Ava veebilehekülg"
 
-#: 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 "_Salvesta kui..."
+
+#: 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 "_Trüki..."
+
+#: 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 "_Lõika"
+
+#: 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 "_Kopeeri"
+
+#: 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 "_Aseta"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: 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 "_Kustuta valitud ülesanded"
 
-#: 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 "Ülesande lisamiseks vajuta siia"
 
@@ -5976,67 +5878,110 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmid"
-
-#: 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 "Lõpetatud"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:5
 #, fuzzy
 msgid "Completion date"
 msgstr "Lõpetamise kuupäev"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Due date"
 msgstr "Tähtaeg"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#, fuzzy
-msgid "Geographical position"
-msgstr "Geograafiline asukoht"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:8
 #, fuzzy
 msgid "Start date"
 msgstr "Alguskuupäev:"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#: 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 "Uus _kokkusaamine..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Uus kogu päeva _sündmus"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Uus koosolek"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Uus ülesanne"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "/_Jälgi teemalõnga"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Vali..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Publitseeri vaba/hõivatud infot"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Trükitava kalendri eelvaatlemine"
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Tõsta prügikasti"
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Ajasta koosolek..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "Edasta i_Kalendrina"
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Ku_stuta see sündmus"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Kustuta k_õik sündmused"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Mine tänasele _päevale"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Mine kuupäevale..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Sätted..."
 
 #. 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
+#: 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
+#: 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"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -6059,38 +6004,26 @@ msgstr "Süsteem läheb maha 1 minuti pärast\n"
 
 #. 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:1572
-#: calendar/gui/e-week-view-main-item.c:320
-#: calendar/gui/print.c:1514
+#: 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:1605
+#: 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:822
-#: calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:825
-#: calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pl"
@@ -6099,444 +6032,417 @@ msgstr "pl"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Iga päev"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Iga %d. päeva"
+msgid_plural "Every %d days"
+msgstr[0] "Iga päev"
+msgstr[1] "Iga päev"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Iga nädal"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Iga %d. nädala"
+msgid_plural "Every %d weeks"
+msgstr[0] "Iga nädal"
+msgstr[1] "Iga nädal"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Igal nädalal"
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Igal %d. nädalal "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Igal nädalal"
+msgstr[1] "Igal nädalal"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "iga kuu"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "Iga %d. kuul"
+msgid_plural "every %d months"
+msgstr[0] "iga kuu"
+msgstr[1] "iga kuu"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Iga aasta"
+msgid_plural "Every %d years"
+msgstr[0] "Iga aasta"
+msgstr[1] "Iga aasta"
 
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Iga %d. aastal"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr "kokku %d korda"
+#: 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] "kokku %d korda"
+msgstr[1] "kokku %d korda"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Algus:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Lõpp: </b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Lõpetatud:</b>"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr " (Tähtaeg "
 
-#: 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 "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: 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 "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst endale sobilik tegevus."
+#: calendar/gui/e-itip-control.c:904
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst endale "
+"sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Asukoht:"
 
 #. 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 "Olek:"
 
-#: calendar/gui/e-itip-control.c:966
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202
+#: 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 "Vastu võetud"
 
-#: 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 "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:974
-#: calendar/gui/e-meeting-list-view.c:272
-#: 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
+#: 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 "Tagasi lükatud"
 
-#: 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 "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Uuenda"
 
-#: 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
-#: shell/e-shell.c:1061
-#: widgets/misc/e-cell-date-edit.c:265
+#: 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 "Olgu"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Nõustu"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Lükka tagasi"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 #, fuzzy
 msgid "Update respondent status"
 msgstr "GGV juhtimise staatus"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: 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 "Tühista"
 
-#: 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> avalikustas koosoleku info."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "koosoleku info"
 
-#: 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> soovib, et koosolekul  ka %s osaleks."
 
-#: 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> soovib, et sa osaleksid koosolekul."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek<b>%s</b> soovib lisada olemasolevale koosolekule"
 
-#: 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> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: 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> soovib saada värskeimat infot koosoleku kohta."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: 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> vastas koosoleku soovile."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: 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> tühistas koosoleku."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: 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
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "Sellegipoolest saadeti sõnum edukalt."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: 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> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: 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> soovib, et sa täidaksid ülesande."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: 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> soovib saada värskeimat infot ülesande kohta."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: 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> vastas ülesande määramisele."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: 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> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: 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> avalikustas vaba/hõivatud info."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: 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> soovib saada sinu vaba/hõivatud infot."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: 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> vastas vaba/hõivatud päringule."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: 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 "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: 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 "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\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 "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
+msgstr ""
+"Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1823
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praegu kohalviibijalt. Kas lisame ta kohalviibijaks?"
 
-#: 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 "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\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 ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine ebaõnnestus!\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 "Sul pole õigusi kalendri muutmiseks\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: 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 "Kirje saadetud!\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 "Kirje saatmine ebaõnnestus!\n"
 
@@ -6582,7 +6488,7 @@ msgid "Chair Persons"
 msgstr "Juhid"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:570
+#: calendar/gui/e-meeting-list-view.c:479
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
@@ -6594,78 +6500,62 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:231
-#: calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107
-#: calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-list-view.c:232
-#: calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:233
-#: calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:245
-#: calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:246
-#: calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144
-#: calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:247
-#: calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200
-#: calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:273
-#: calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206
-#: calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:274
-#: calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-store.c:189
-#: calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "Töös"
 
@@ -6678,33 +6568,20 @@ msgstr "%A, %d. %B %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
+#: 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
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460
-#: e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299
-#: widgets/misc/e-dateedit.c:1604
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:400
-#: designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
@@ -6784,14 +6661,12 @@ msgstr "Tähtsus:"
 msgid "Web Page:"
 msgstr "Veebilehekülg:"
 
-#: calendar/gui/e-tasks.c:310
-#: mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "%s: Avamine ei õnnestunud: %s\n"
 
-#: calendar/gui/e-tasks.c:773
-#: calendar/gui/gnome-cal.c:1903
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6803,7 +6678,6 @@ msgstr ""
 #  FIXME: this doesn't remove the task list from the list or anything
 #. FIXME: this doesn't remove the task list from the list or anything
 #: calendar/gui/e-tasks.c:792
-#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6838,35 +6712,37 @@ msgstr "Trüki ülesanded"
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:1062
+#: calendar/gui/e-tasks.c:1063
 #, fuzzy
 msgid "Expunging"
 msgstr "Hävitan kustutatud sõnumid"
 
-#: calendar/gui/gnome-cal.c:1738
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Avan %s ülesanded"
-
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Austria (de_AT)"
 
-#: calendar/gui/gnome-cal.c:1783
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Avan %s ülesanded"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:1932
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2776
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -6887,47 +6763,48 @@ msgid "February"
 msgstr "Veebruar"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Mine kuupäevale"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Jaanuar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juuli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juuni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Märts"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: 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 "Oktoober"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Vali kogu tekst"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Mine tänasele"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Vali kalendrikaust"
 
-#: calendar/gui/itip-utils.c:271
-#: calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema määrtud."
@@ -6936,23 +6813,19 @@ msgstr "Organiseerija peab olema määrtud."
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:394
-#: calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:396
-#: calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:398
-#: calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Päevaraamatu informatsioon"
 
-#: calendar/gui/itip-utils.c:400
-#: calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud informatsioon"
 
@@ -6992,14 +6865,16 @@ msgstr "Sisesta sisesta parool %s jaoks"
 
 #: calendar/gui/migration.c:137
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
 #: calendar/gui/migration.c:141
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -7009,7 +6884,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 #, fuzzy
 msgid "On The Web"
 msgstr "gtranslatori kodulehekülg www-s"
@@ -7171,8 +7046,7 @@ msgstr "L"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1939
-#: calendar/gui/print.c:1943
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
@@ -7180,8 +7054,7 @@ msgstr "%a, %d. %b"
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1944
-#: calendar/gui/print.c:1946
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
@@ -7234,10 +7107,8 @@ msgstr "Kategooriad: %s"
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2559
-#: calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737
-#: 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 "Väljatrüki eelvaade"
 
@@ -7254,36 +7125,36 @@ msgstr "Trükkimise sätted"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "Ü_lesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Loo uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7298,7 +7169,8 @@ msgstr "Ei saa laadida '%s' ülesandeid"
 
 #: calendar/gui/tasks-control.c:478
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
@@ -8971,15 +8843,13 @@ msgstr "Loob virtuaalse kausta selle sõnumi adressaatide järgi"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:667
-#: camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kataloogi %s loomine ebaõnnestus."
 
-#: camel/camel-filter-driver.c:711
-#: camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
@@ -8990,19 +8860,16 @@ msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934
-#: camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1032
-#: camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1041
-#: camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
@@ -9024,14 +8891,12 @@ msgstr "Võetakse vastu teadet %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1137
-#: camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1163
-#: camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
@@ -9058,8 +8923,7 @@ msgstr ""
 msgid "Invalid arguments to (user-tag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:670
-#: camel/camel-filter-search.c:678
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga otsingu avaldises."
@@ -9080,8 +8944,7 @@ msgid ""
 "%s"
 msgstr "Viga otsingu avaldises."
 
-#: camel/camel-folder-search.c:569
-#: camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
@@ -9148,13 +9011,10 @@ msgstr ""
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: 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-ops.c:697
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Loobutud."
 
@@ -9185,27 +9045,21 @@ msgstr "%s laadimine ebaõnnestus: %s\n"
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s laadimine ebaõnnestus: %s\n"
 
-#: camel/camel-gpg-context.c:1242
-#: camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1256
-#: camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
 #: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 
-#: camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1414
-#: camel/camel-gpg-context.c:1501
-#: camel/camel-gpg-context.c:1524
-#: camel/camel-gpg-context.c:1608
-#: camel/camel-gpg-context.c:1632
-#: camel/camel-gpg-context.c:1686
-#: camel/camel-gpg-context.c:1737
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
@@ -9214,10 +9068,8 @@ msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1381
-#: camel/camel-gpg-context.c:1390
-#: camel/camel-smime-context.c:717
-#: camel/camel-smime-context.c:728
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
+#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
@@ -9238,8 +9090,7 @@ msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1639
-#: camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Vigane \\{\\} kontekst"
@@ -9259,8 +9110,7 @@ msgstr "Ei suuda luua lukustamisabilise toru: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
 
-#: camel/camel-lock-client.c:191
-#: camel/camel-lock-client.c:214
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, fuzzy, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
@@ -9270,8 +9120,7 @@ msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
 msgid "Could not lock '%s'"
 msgstr "%s: Ei saa lukustada küpsise faili %s"
 
-#: camel/camel-lock.c:92
-#: camel/camel-lock.c:113
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
@@ -9341,14 +9190,12 @@ msgstr "Viga faili lugemisel."
 msgid "Error writing mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-movemail.c:465
-#: camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-multipart-encrypted.c:229
-#: camel/camel-multipart-encrypted.c:244
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
@@ -9356,8 +9203,7 @@ msgstr ""
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:673
-#: camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "%s: viga võtmete analüüsimisel\n"
@@ -9386,8 +9232,7 @@ msgstr "Ei suuda laadida faili: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-provider.c:356
-#: camel/camel-session.c:160
+#: camel/camel-provider.c:356 camel/camel-session.c:160
 #, fuzzy, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
@@ -9401,8 +9246,7 @@ msgstr "Anonüümselt"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
 
-#: camel/camel-sasl-anonymous.c:112
-#: camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentimine ebaõnnestus"
@@ -9439,16 +9283,24 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist CRAM-MD5 parooli."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
+"kasutades turvalist CRAM-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist DIGEST-MD5 parooli."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
+"kasutades turvalist DIGEST-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9484,7 +9336,9 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:153
@@ -9492,19 +9346,27 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:156
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:160
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:165
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:169
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
@@ -9524,12 +9386,10 @@ msgstr ""
 msgid "The referenced credentials have expired."
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: 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-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:1193
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -9565,8 +9425,7 @@ msgstr ""
 msgid "Login"
 msgstr "Kasutaja"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
@@ -9582,7 +9441,9 @@ msgstr "Vale SPA käepigistus: %s"
 
 #: camel/camel-sasl-ntlm.c:33
 #, fuzzy
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-plain.c:32
@@ -9635,14 +9496,12 @@ msgstr "URL '%s' vajab kataloogitee osa"
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:764
-#: camel/camel-service.c:888
+#: camel/camel-service.c:764 camel/camel-service.c:888
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:785
-#: camel/camel-service.c:909
+#: camel/camel-service.c:785 camel/camel-service.c:909
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
@@ -9738,36 +9597,33 @@ msgstr "Viga rea %d töötlemisel (%s)\n"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, tüüp: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:242
+#: camel/camel-store.c:244
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:377
-#: 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 "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:773
-#: mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 #, fuzzy
 msgid "Trash"
 msgstr "Tarbetu"
 
-#: camel/camel-store.c:775
-#: filter/libfilter-i18n.h:35
-#: mail/mail-ops.c:1083
+#: 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
 #, fuzzy
 msgid "Junk"
@@ -9912,8 +9768,7 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: camel/camel-tcp-stream-openssl.c:696
-#: camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9922,14 +9777,12 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
-#: camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 #, fuzzy
 msgid "GOOD"
 msgstr "Hea soovitus"
 
-#: camel/camel-tcp-stream-openssl.c:702
-#: camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 #, fuzzy
 msgid "BAD"
 msgstr "Halvad võtmed"
@@ -10000,8 +9853,7 @@ msgstr "viga (mitteassotsiatiivne)\n"
 msgid "No such message %s in %s"
 msgstr "Sõnum mitmes vormingus"
 
-#: camel/camel-vee-folder.c:815
-#: camel/camel-vee-folder.c:821
+#: camel/camel-vee-folder.c:815 camel/camel-vee-folder.c:821
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
@@ -10052,42 +9904,40 @@ msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Sisesta serveri nimi"
+msgid "Address Book And Calendar"
+msgstr "Aadressiraamat"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Otsingu baas:"
+#: 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
 #, fuzzy
 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 ""
 
-#: 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 "Parool"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 #, fuzzy
 msgid "Checklist"
 msgstr "nimekiri"
@@ -10095,12 +9945,12 @@ msgstr "nimekiri"
 #: 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:2860
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2863
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -10156,12 +10006,12 @@ msgstr "Kaust hävitati ja taasloodi serveris."
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1926
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: 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
@@ -10177,25 +10027,25 @@ msgstr ""
 "Ei saa kätte sõnumit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: 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 "Sõnumit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:1995
-#: camel/providers/imap/camel-imap-folder.c:2591
+#: 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 "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2255
-#: camel/providers/imap/camel-imap-folder.c:2325
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2629
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
@@ -10273,18 +10123,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:424
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Vali server"
 
-#: camel/providers/imap/camel-imap-store.c:427
+#: camel/providers/imap/camel-imap-store.c:426
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Serveri %s turvainfo kaotas kehtivuse %s."
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
+#: 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
@@ -10294,15 +10144,15 @@ msgstr "Serveri %s turvainfo kaotas kehtivuse %s."
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "Otsing ei ole saadaval"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:796
+#: 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
@@ -10311,51 +10161,51 @@ msgstr "Otsing ei ole saadaval"
 msgid "Connection cancelled"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/imap/camel-imap-store.c:630
-#: camel/providers/imap/camel-imap-store.c:661
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: camel/providers/imap/camel-imap-store.c:631
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:662
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "abiprogramm `%s' ebaõnnestus"
 
-#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1223
+#: 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 ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1233
+#: 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 "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1256
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1299
+#: camel/providers/imap/camel-imap-store.c:1303
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10363,13 +10213,20 @@ msgid ""
 "\n"
 msgstr "Ei saa luua ühendust meiliserveriga \"%*.*s\""
 
-#: camel/providers/imap/camel-imap-store.c:1717
-#: camel/providers/imap/camel-imap-store.c:1798
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1739
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
+
+#: 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
@@ -10379,17 +10236,12 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-store.c:1999
-#, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
-
-#: camel/providers/imap/camel-imap-store.c:2011
+#: camel/providers/imap/camel-imap-store.c:2102
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Viga kataloogi \"%s\" loomisel: %s\n"
 
-#: camel/providers/imap/camel-imap-store.c:2047
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10426,20 +10278,20 @@ msgstr ""
 "\n"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:389
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s @ %s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Postikast"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10464,7 +10316,9 @@ msgstr "Kohalik postijagaja"
 
 #: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
-msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Kohalikku e-posti võetakse standardsest \"mbox\" vorminguga puhvrist"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -10494,7 +10348,9 @@ msgstr "Standardne Unix'i \"mbox\" puhver"
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga puhverfailides"
+msgstr ""
+"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
+"puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:215
@@ -10632,23 +10488,23 @@ msgstr ""
 "Ei suuda luua kataloogi %s:\n"
 "%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 ""
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Järjekindlus viib sihile"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Uute sõnumite kontroll"
 
-#: 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
@@ -10801,8 +10657,7 @@ msgstr "Ei saa luua sihtkataloogi: %s."
 msgid "Could not close temp folder: %s"
 msgstr "Ei saa luua sihtkataloogi: %s."
 
-#: camel/providers/local/camel-mbox-summary.c:592
-#: mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kataloogi nime muutmine ei õnnestunud."
@@ -11059,7 +10914,8 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Ei saa avada töölaua (desktop) faili %s paneeli käivitajale %s%s\n"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11075,7 +10931,9 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
-msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:158
@@ -11201,6 +11059,8 @@ msgstr "[Elemendid ]omaniku UID-ga \"%s\""
 
 #  Sigh, most of the crap in this function is so that the cancel button
 #  returns the proper exception code.  Sigh.
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:411
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
@@ -11223,8 +11083,7 @@ msgstr "Kustuta %s päeva möödumisel"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-#: mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11233,11 +11092,16 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "E-posti laetakse alla POP serverist"
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:195
@@ -11260,7 +11124,9 @@ msgstr "Ei õnnestu luua ühendust WAIS serveriga."
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
 #, fuzzy, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:423
@@ -11299,12 +11165,14 @@ msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "E-posti saatmiseks kohaliku süsteemi programmi \"sendmail\" abil."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
@@ -11320,7 +11188,8 @@ msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+msgstr ""
+"Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, fuzzy, c-format
@@ -11350,13 +11219,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sõnumite trantsport sendmail programmiga"
 
-#: 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 "E-posti saatmiseks SMTP protokolli abil läbi võrgus oleva mailhub'i.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11606,6 +11475,9 @@ msgstr "DATA käsk ebaõnnestus: %s: meil jäi saatmata"
 
 #  we should have gotten instructions on how to use the DATA command:
 #  * 354 Enter mail, end with "." on a line by itself
+#. 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:1269
 #: camel/providers/smtp/camel-smtp-transport.c:1345
 msgid "DATA command failed"
@@ -11629,46 +11501,45 @@ msgstr "QUIT käsk ebaõnnestus: %s"
 msgid "QUIT command failed"
 msgstr "QUIT käsk ebaõnnestus"
 
-#: 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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "manus"
 
-#: 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 "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Salvesta artikkel faili"
 
-#: 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 "Ei saa lisada faili manusesse: %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 "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
@@ -11691,21 +11562,21 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
 msgstr "Vigane sihtkoht"
 
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Lisa sõnumile manus"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu avamine ebaõnnestus"
@@ -11717,58 +11588,60 @@ msgstr "Aadressiraamatu avamine ebaõnnestus"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:573
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:579
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 #, fuzzy
 msgid "To:"
 msgstr "Kuhu:"
 
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:603
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+#: 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."
 msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "Post To:"
 msgstr "Postita gruppi "
 
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<kausta valimiseks kliki siia>"
@@ -11778,17 +11651,20 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Attach file(s)"
 msgstr "Lisab sõnumile faili"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 #, fuzzy
-msgid "Cannot encrypt outgoing message: No encryption certificate set for from account"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
 msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11797,46 +11673,45 @@ msgstr ""
 "Viga faili: %s lugemisel\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada üle?"
 
-#: 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 "Viga faili: %s salvestamisel"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili: %s laadimisel"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Tõrge faili: %s avamisel"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Ei saa sulgeda mooduli faili \"%s\"."
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Ei saa avada faili '%s'"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11847,14 +11722,14 @@ msgstr ""
 "faili:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "VIGA: Artikkel on tühi."
 
-#: 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?"
@@ -11862,7 +11737,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist pärit salvestamata faile.\n"
 "Kas sa soovid üritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11873,51 +11748,53 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Allkiri:"
-
-#: composer/e-msg-composer.c:2085
-#: mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Allkiri:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295
-#: composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312
-#: composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11928,7 +11805,7 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: 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."
@@ -11936,8 +11813,10 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:4239
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+#: composer/e-msg-composer.c:4290
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
@@ -11979,7 +11858,8 @@ msgstr "<b>Olek:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 
@@ -12024,8 +11904,10 @@ msgstr "meili info"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -12054,7 +11936,9 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr ""
 
 #: e-util/e-dialog-utils.c:249
@@ -12094,20 +11978,14 @@ msgstr "trustdb: sync ebaõnnestus: %s\n"
 #  time, in 12-hour format, without seconds.
 #. 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
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %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
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
@@ -12127,12 +12005,14 @@ msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y"
 
 #  strptime format of a date and a time, in 12-hour format.
+#. strptime format of a date and a time, in 12-hour format.
 #: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #  strptime format of a date and a time, in 24-hour format.
+#. strptime format of a date and a time, in 24-hour format.
 #: e-util/e-time-utils.c:215
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
@@ -12140,6 +12020,8 @@ msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #  strptime format of a date and a time, in 12-hour format,
 #  without seconds.
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
 #: e-util/e-time-utils.c:220
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
@@ -12147,6 +12029,8 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #  strptime format of a date and a time, in 24-hour format,
 #  without seconds.
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
 #: e-util/e-time-utils.c:225
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
@@ -12154,6 +12038,8 @@ msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #  strptime format of a date and a time, in 12-hour format,
 #  without minutes or seconds.
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
 #: e-util/e-time-utils.c:230
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
@@ -12161,6 +12047,8 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #  strptime format of a date and a time, in 24-hour format,
 #  without minutes or seconds.
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
 #: e-util/e-time-utils.c:235
 #, fuzzy
 msgid "%m/%d/%Y %H"
@@ -12168,39 +12056,27 @@ msgstr "%d.%m.%Y"
 
 #  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
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 #, fuzzy
 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
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348
-#: e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414
-#: widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352
-#: e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411
-#: widgets/misc/e-dateedit.c:1636
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12210,14 +12086,56 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
+#, fuzzy, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 sekund"
+msgstr[1] "1 sekund"
+
 #: filter/filter-datespec.c:74
+#, fuzzy, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minut"
+msgstr[1] "1 minut"
+
 #: filter/filter-datespec.c:75
+#, fuzzy, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "1 tund"
+msgstr[1] "1 tund"
+
 #: filter/filter-datespec.c:76
+#, fuzzy, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "1 päev"
+msgstr[1] "1 päev"
+
 #: filter/filter-datespec.c:77
+#, fuzzy, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 nädal"
+msgstr[1] "1 nädal"
+
 #: filter/filter-datespec.c:78
+#, fuzzy, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "1 kontakt"
+msgstr[1] "1 kontakt"
+
 #: filter/filter-datespec.c:79
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:187
-#, fuzzy, c-format
+#, fuzzy
 msgid "You must choose a date."
 msgstr "Sa valisid vigase kuupäeva."
 
@@ -12226,12 +12144,12 @@ msgstr "Sa valisid vigase kuupäeva."
 msgid "<click here to select a date>"
 msgstr "<kausta valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:290
-#: filter/filter-datespec.c:301
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "praegu"
 
 #  strftime for date filter display, only needs to show a day date (i.e. no time)
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
 #: filter/filter-datespec.c:297
 #, fuzzy
 msgid "%d-%b-%Y"
@@ -12241,6 +12159,11 @@ msgstr "%a, %d. %b %Y"
 msgid "Select a time to compare against"
 msgstr "Vali aeg, millega võrrelda"
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Kasutamata reeglid"
+
 #: filter/filter-file.c:166
 #, fuzzy
 msgid "You must specify a file name."
@@ -12256,6 +12179,7 @@ msgid "Choose a file"
 msgstr "Vali faili"
 
 #  and now for the action area
+#. and now for the action area
 #: filter/filter-filter.c:491
 #, fuzzy
 msgid "<b>Then</b>"
@@ -12266,9 +12190,8 @@ msgstr "P_aremale, siis alla"
 msgid "You must specify a folder."
 msgstr "Sa pead käsu määrama"
 
-#: filter/filter-folder.c:243
-#: filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1147
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vali kalendrikaust"
@@ -12282,35 +12205,29 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%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
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Important"
 msgstr "Tähtis"
 
 #  forest green
-#: filter/filter-label.c:124
-#: mail/em-migrate.c:926
-#: mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "To Do"
 msgstr "midagi ei ole teha.\n"
 
 #  blue
-#: filter/filter-label.c:125
-#: mail/em-migrate.c:927
-#: mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Later"
 msgstr "Hilisemad artiklid"
 
-#: filter/filter-part.c:532
-#: 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"
 
@@ -12361,45 +12278,23 @@ msgstr "    "
 
 #: filter/filter.glade.h:2
 #, fuzzy
-msgid "<b>Filter Rules</b>"
-msgstr "Kasutamata reeglid"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>Virtual _Folders</b>"
-msgstr "Virtuaalsed kaustad"
-
-#: filter/filter.glade.h:4
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
 msgstr "Kasutamata reeglid"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 #, fuzzy
 msgid "<b>vFolder Sources</b>"
 msgstr "vKausta allikad"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Võrdle"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Redigeeri filtreid"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Redigeeri VKaustu"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Väljaminev"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12408,7 +12303,7 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud ajahetkega."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12418,7 +12313,7 @@ msgstr ""
 "mis on suhteline filtri käivitamise hetkega.\n"
 "Näiteks: 2 nädalat tagasi"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12427,59 +12322,59 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud ajahetkega."
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "ajaga, mis on suhteline käesoleva hetkega"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "tagasi"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:24
-#: mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 #, fuzzy
 msgid "seconds"
 msgstr "sekundi järel"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "ainult kirjeldatud kaustad"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 #, fuzzy
 msgid "the current time"
 msgstr "Praegune _aeg"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 #, fuzzy
 msgid "the time you specify"
 msgstr "Sa pead nime määrama."
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nädalat"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "koos kõigi aktiivsete võrgukaustadega"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "koos kõigi kohalike kalatoogidega"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "aastat"
 
 #  Automatically generated. Do not edit.
+#. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Kohanda hinnet"
@@ -12616,8 +12511,7 @@ msgstr "%s ei ole tõene."
 msgid "Junk Test"
 msgstr "Html test"
 
-#: filter/libfilter-i18n.h:37
-#: mail/em-folder-view.c:773
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -12655,15 +12549,14 @@ msgstr "Tõsta kausta"
 
 #: filter/libfilter-i18n.h:44
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Saada kontaktile sõnum"
+msgid "Pipe to Program"
+msgstr "Välju programmist"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: filter/libfilter-i18n.h:46
-#: mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
 #, fuzzy
 msgid "Read"
 msgstr "Loe"
@@ -12693,25 +12586,24 @@ msgid "returns less than"
 msgstr "tagastab vähem kui"
 
 #: filter/libfilter-i18n.h:53
-#: filter/score-rule.c:184
-#: filter/score-rule.c:186
+#, fuzzy
+msgid "Run Program"
+msgstr "Käivita programm:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Saatja"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 #, fuzzy
 msgid "Set Status"
 msgstr "Olekutekst"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Kesta käsk"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
@@ -12736,13 +12628,9 @@ msgstr "algab"
 msgid "Stop Processing"
 msgstr "Peata töötlemine"
 
-#: filter/libfilter-i18n.h:64
-#: mail/em-format-html.c:1512
-#: 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: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 "Teema"
@@ -12752,10 +12640,8 @@ msgstr "Teema"
 msgid "Unset Status"
 msgstr "Olekutekst"
 
-#: filter/rule-context.c:682
-#: filter/rule-editor.c:239
-#: filter/rule-editor.c:326
-#: 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 ""
@@ -12772,8 +12658,9 @@ msgstr "Muuda reeglit"
 msgid "Rule name"
 msgstr "Reegli nimi"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Hindereeglid"
 
 #: filter/searchtypes.xml.h:1
@@ -12809,6 +12696,11 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuaalsed kaustad"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Sa pead sellele vKaustale nime määrama."
@@ -12827,7 +12719,8 @@ msgid "Composer Preferences"
 msgstr "Kella häälestus"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -12876,10 +12769,8 @@ msgstr "Evolution'i kalendri iTip/iMip vaataja"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Meili seadistuste "
 
-#: 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 "Meil"
@@ -12888,57 +12779,52 @@ msgstr "Meil"
 msgid "Mail Accounts"
 msgstr "Meilikontod"
 
-#: 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 "Meili häälestus"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Ära kustuta"
 
 #  translators: default account indicator
-#: mail/em-account-prefs.c:445
+#. translators: default account indicator
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: 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 "Nimetu"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Stiili nimi:"
 
-#: mail/em-composer-prefs.c:396
-#: mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[skript]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Lisa allkirjaskript"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "PGP allkiri"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
@@ -12959,7 +12845,9 @@ msgstr ""
 "Kas saadame ilma teemata?"
 
 #: mail/em-composer-utils.c:153
-msgid "Since the contact list you are sending to is configured to hide the list's addresses, this message will contain only Bcc recipients."
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
 msgstr ""
 
 #: mail/em-composer-utils.c:157
@@ -12968,7 +12856,8 @@ msgstr "See sõnum sisaldab ainult BCC saajaid."
 
 #: mail/em-composer-utils.c:162
 msgid ""
-"It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
@@ -12982,7 +12871,7 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
@@ -12991,11 +12880,13 @@ msgid "Folder properties"
 msgstr "Kausta omadused"
 
 #  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
 #: mail/em-folder-properties.c:126
 msgid "Properties"
 msgstr "Omadused"
 
 #  TODO: can this be done in a loop?
+#. TODO: can this be done in a loop?
 #: mail/em-folder-properties.c:135
 msgid "Folder Name"
 msgstr "Kausta nimi"
@@ -13012,13 +12903,11 @@ msgstr "Lugemata sõnumid"
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
-#: mail/em-folder-selector.c:166
-#: shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2217
+#: 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:"
@@ -13029,169 +12918,156 @@ msgstr "Kirjelda, kuhu tuleb kaust luua:"
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree-model.c:196
-#: mail/em-folder-tree-model.c:198
-#: 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 "VKaustad"
 
-#: mail/em-folder-tree-model.c:206
-#: mail/em-folder-tree-model.c:208
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 #, fuzzy
 msgid "UNMATCHED"
 msgstr "Puudub \\{"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:236
-#: mail/em-folder-tree-model.c:238
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:483
-#: mail/em-folder-tree-model.c:792
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Laen..."
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:883
+#: mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:885
+#: mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:1947
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: mail/em-folder-tree.c:1976
-#: mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, fuzzy, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1992
-#: mail/em-folder-tree.c:2005
-#: mail/em-folder-view.c:642
-#: mail/em-folder-view.c:656
+#: 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
 #, fuzzy
 msgid "Select folder"
 msgstr "Vali kalendrikaust"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2035
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Viga kataloogi \"%s\" loomisel: %s\n"
 
-#: mail/em-folder-tree.c:2217
-#: mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Uus _kataloog"
 
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 "Ei suuda luua kataloogi %s:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2361
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2388
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Kustuta"
 
-#: mail/em-folder-tree.c:2411
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2457
 #, fuzzy, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Nimi \"%s\" on juba siin kaustas olemas. Palun kasuta teist nime."
 
-#: mail/em-folder-tree.c:2492
-#: ui/evolution-addressbook.xml.h:45
-#: 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
+#: 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
 #, fuzzy
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ava uues aknas"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "_Liiguta"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Uus kataloog"
 
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2516
 #, fuzzy
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2508
-#: ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Omadused..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:741
-#: mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "/Redaktor/Sea _taustapildiks"
@@ -13200,26 +13076,22 @@ msgstr "/Redaktor/Sea _taustapildiks"
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:746
-#: 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 "_Vasta saatjale"
 
-#: mail/em-folder-view.c:747
-#: 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 "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:748
-#: mail/em-popup.c:809
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Vasta kõigile"
 
-#: mail/em-folder-view.c:749
-#: 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 "_Edasta"
@@ -13239,8 +13111,7 @@ msgstr "%s kirjutamine valmis"
 msgid "Cl_ear Flag"
 msgstr "   a   lülitada buuditavuse lipp sisse/välja"
 
-#: mail/em-folder-view.c:757
-#: 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 "_Märgi loetuks"
 
@@ -13259,14 +13130,12 @@ msgstr "Märgi kui l_ugemata"
 msgid "_Mark as Unimportant"
 msgstr "Märgi kui l_ugemata"
 
-#: mail/em-folder-view.c:761
-#: ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Märgi kui l_ugemata"
 
-#: mail/em-folder-view.c:762
-#: ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Märgi vähetä_htsaks"
@@ -13281,8 +13150,7 @@ msgstr "_Kustuta"
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta prügikasti"
 
-#: mail/em-folder-view.c:770
-#: ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopeeri kausta..."
@@ -13352,9 +13220,8 @@ msgstr "Filter _adressaatide järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1583
-#: mail/em-folder-view.c:1621
-#: 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 "UTF-8"
 
@@ -13368,132 +13235,142 @@ msgstr "Trükib valitud sõnumi"
 msgid "_Copy Link Location"
 msgstr "Kopeeri _link"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Meiliserveriga ühendamine"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Ei leia: %s"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Määratud"
 
 # !PARANDA! - kas on ikka täpne tõlge?
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "Allkiri on kehtiv kuni? (0) "
 
 # !PARANDA! - kas on ikka täpne tõlge?
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: mail/em-format-html-display.c:640
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: mail/em-format-html-display.c:647
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641
-#: mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 #, fuzzy
 msgid "Valid signature, cannot verify sender"
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: mail/em-format-html-display.c:641
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: mail/em-format-html-display.c:648
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-#: mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Katkestatud"
 
-#: mail/em-format-html-display.c:647
-msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
+#: mail/em-format-html-display.c:654
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648
-#: mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "nõrk võti"
 
-#: mail/em-format-html-display.c:648
-msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+#: mail/em-format-html-display.c:655
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-#: mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "Krüpteeritud sõnum"
 
-#: mail/em-format-html-display.c:649
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: mail/em-format-html-display.c:656
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650
-#: mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Krüpteeritud sõnum"
 
-#: mail/em-format-html-display.c:650
-msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+#: mail/em-format-html-display.c:657
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ava sertifikaat"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "See kataloog ei ole loetav."
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr " vasakul:"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Tähtaja ületanud ülesanded:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "Grupeeritud:"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Kuva sõnumi sees (%s abil)"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "_Peida"
@@ -13503,117 +13380,98 @@ msgstr "_Peida"
 msgid "Page %d of %d"
 msgstr "&[PAGE]"
 
-#: mail/em-format-html.c:455
-#: mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Võtan vastu POP kokkuvõtet"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%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 ""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Viide kaugfailile"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Sõnumi kuulajaskond"
 
-#: mail/em-format-html.c:1406
-#: 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/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:304
 #, fuzzy
 msgid "From"
 msgstr "Saatja"
 
-#: mail/em-format-html.c:1406
-#: 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:744
 #: mail/em-mailer-prefs.c:68
 #, fuzzy
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: mail/em-format-html.c:1406
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:745
-#: mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: 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
 #, fuzzy
 msgid "To"
 msgstr "_kuni:"
 
-#: mail/em-format-html.c:1406
-#: 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/em-format-html.c:1406
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:747
+#: 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 "Pimekoopia"
 
 #. pseudo-header
-#: mail/em-format-html.c:1516
-#: mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
 #  translators: strftime format for local time equivalent in Date header display, with day
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1556
-#: mail/em-format-quote.c:315
-#: mail/em-format.c:749
-#: mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: 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
 #, fuzzy
 msgid "Date"
 msgstr "Kuupäev"
 
-#: mail/em-format-html.c:1577
-#: mail/em-format.c:750
-#: mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 #, fuzzy
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
@@ -13623,15 +13481,12 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1066
-#: mail/em-format.c:1188
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ei saa saata sõnumit: %s"
 
-#: mail/em-format.c:1086
-#: mail/em-format.c:1106
-#: mail/em-format.c:1130
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
 #: mail/em-format.c:1223
 #, c-format
 msgid "Internal error: expecting CamelMultipart, got \"%s\""
@@ -13692,30 +13547,28 @@ msgstr "Sea kalendrikuu"
 
 #: mail/em-migrate.c:1079
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843
-#: mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:1946
-#: mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:2171
-#: mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Kataloogi %s loomine ebaõnnestus."
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "'%s' avamine kirjutamiseks ebaõnnestus: %s"
@@ -13759,131 +13612,132 @@ msgstr "_Lisa paneelile"
 msgid "Open in %s..."
 msgstr "_Avaneb"
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: 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
 #, fuzzy
 msgid "Folder"
 msgstr "Kataloog"
 
 #. 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 "Palun vali server."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Asukoht ei ole määratud!"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Ä_ra näita seda teadet selle serveri kohta uuesti"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "VIGA: info pole veel saadaval"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 #, fuzzy
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tundmatu aken"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: mail/em-utils.c:1432
-#: mail/em-utils.c:1516
-#: mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr "Ei saa kävitaja muudatusi salvestada"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr "Fail %s on juba olemas. Kas kirjutada üle?"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Sõnum"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "'%s' ei ole kataloog"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Salvesta artikkel faili"
 
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Andmed (%s -st)"
 
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
-"This operation will permanently remove all deleted messages in the folder `%s'. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+"enam võimalik taastada.\n"
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: mail/em-utils.c:2477
+#: mail/em-utils.c:2480
 #, fuzzy
 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"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+"enam võimalik taastada.\n"
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
@@ -13957,393 +13811,434 @@ msgstr "Näitab sõnumi eelvaate akent"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Näitab sõnumi eelvaate akent"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "Vaikimisi raami laad:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Vaikimisi akna vertikaalsuurus"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Näitab sõnumi eelvaate akent"
 
-#: 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 "Näitab sõnumi eelvaate akent"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 #, fuzzy
 msgid "Enable/disable caret mode"
 msgstr "Luba või keela heli"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Saada sõnum hiljem"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
-msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Predikaatide loend:\n"
 
-#: mail/evolution-mail.schemas.in.in.h:29
-msgid "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:31
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
-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."
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
-msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Vali filtreerimislogi fail..."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "Message Window default hight"
 msgstr "Vaikimisi akna vertikaalsuurus"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "Message Window default width"
 msgstr "Muuda veergude laiuse vaikeväärtust"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: 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:47
+#: 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:48
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "E-posti seadistamine"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Uus parool uuesti: "
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "Prompt on empty subject"
 msgstr "tühi koht tableaul"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "S414j4n3 5uv4nd"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "S414j4n3 5uv4nd."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Saada sõnum HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Saada sõnum HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Luba animatsioonid"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Näita aega kui"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Näita sõnumit normaalse stiiliga"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Näita redigeerimispaani"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 #, fuzzy
 msgid "Show the \"Preview\" pane."
 msgstr "Näita redigeerimispaani"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Klõpsa õigekirja kontrollimiseks"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Vaikimisi akna vertikaalsuurus"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Muuda veergude laiuse vaikeväärtust"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminali kirjatüüp:"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: 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:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
-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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+#: 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;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine meili näitamisel"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "Kirjaperekond määratud"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
-msgid "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:106
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Pordi sisestusväli"
@@ -14393,8 +14288,7 @@ msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 #: 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
 #, fuzzy
 msgid "Importing..."
 msgstr "Impordin faile"
@@ -14402,8 +14296,7 @@ msgstr "Impordin faile"
 #: 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 "Palun oota"
 
@@ -14453,12 +14346,12 @@ msgstr "Postkasti vorming"
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Lisa filter"
 
-#: 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"
@@ -14473,7 +14366,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14481,7 +14374,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14490,26 +14383,26 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "   e   redigeerida sedame andmeid"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 #, fuzzy
 msgid "Settings"
 msgstr "Seaded"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 #, fuzzy
 msgid "Mail Filters"
 msgstr "_Rakenda filtreid"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 #, fuzzy
 msgid ""
 "Evolution has found Netscape mail files.\n"
@@ -14545,70 +14438,32 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine Bluff"
 
-#: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Current store format:"
-msgstr "Kohandatud kellaformaat"
-
-#: mail/local-config.glade.h:2
-#, fuzzy
-msgid "Index body contents"
-msgstr "Vigane sõnumi sisu"
-
-#: mail/local-config.glade.h:3
-#, fuzzy
-msgid "New store format:"
-msgstr "Kohandatud kellaformaat"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "maildir"
-msgstr "ei ole maildir vormingus kataloog"
-
-#: 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 ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-account-gui.c:790
-#: mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Host:"
 msgstr "Server"
 
-#: mail/mail-account-gui.c:794
-#: mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "Kasutajanimi"
 
-#: mail/mail-account-gui.c:798
-#: mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
-#: mail/mail-account-gui.c:2074
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua ühe nimega kahte kontot."
 
@@ -14641,12 +14496,12 @@ msgstr "Võrdne:"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 #, fuzzy
 msgid "The following filter rule(s):\n"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14693,193 +14548,328 @@ msgstr "Loo uus isehoidjate kaust"
 msgid "URI of the mail source that the view will display"
 msgstr "URI, mida kalender näitab"
 
-#: 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 "Identiteet"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 #, fuzzy
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
-"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. \"Mittekohustuslikud\" väljad\n"
-"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma sõnumitesse."
+"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
+"\"Mittekohustuslikud\" väljad\n"
+"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma "
+"sõnumitesse."
 
-#: 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
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Teile on kirju\n"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 #, fuzzy
-msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
+msgid ""
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. Kui sa ei ole para-\n"
-"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. "
+"Kui sa ei ole para-\n"
+"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
+"interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Meilisõnumi saatmine"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 #, fuzzy
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti välja saata. Kui sa ei ole\n"
-"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti "
+"välja saata. Kui sa ei ole\n"
+"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
+"interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:394
-#: mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 #, fuzzy
 msgid "Account Management"
 msgstr "Failihaldus"
 
-#: mail/mail-config-druid.c:396
-msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
+#: 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 "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:1170
-#: mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Meiliserveriga ühendamine"
 
-#: 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 "_Tuvasta toetatavad tüübid"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Eelvaade"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "See šiffer ei toeta allkirjastamist"
 
 #: mail/mail-config.glade.h:5
 #, fuzzy
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "See šiffer ei toeta allkirjastamist"
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Olek:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "Päised ja jalused"
+msgid "<b>_Languages</b>"
+msgstr "<b>Olek:</b>"
+
+#: mail/mail-config.glade.h:7
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-#, fuzzy
-msgid "Account Editor"
-msgstr "Toimeti käivitusfail:"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Account Information"
-msgstr "Üldine teave"
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Uute sõnumite kontroll"
 
 #: mail/mail-config.glade.h:12
-#, fuzzy
-msgid "Add Sc_ript"
-msgstr "_Lisa paneelile"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "Add new signature..."
-msgstr "   n   lisada uus partitsioon"
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr "Päised ja jalused"
+
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:20
+msgid "<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 "Teile on uusi kirju\n"
+
+#: 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"
+
+#: 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 "Vigane ülesande sõnum"
+
+#: 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 ""
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Account Editor"
+msgstr "Toimeti käivitusfail:"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "   n   lisada uus partitsioon"
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "_Lisa paneelile"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
+
+#: mail/mail-config.glade.h:43
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Attach original message"
 msgstr "Teatel puudub algne tekst!"
 
-#: 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 "Manus"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Authentication"
-msgstr "autentimine"
+msgid "Automatically _insert smiley images"
+msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Kontrolli uusi sõnumeid automaatselt"
+
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:52
 #, fuzzy
-msgid "C_olors"
-msgstr "_Värvid"
+msgid "Ch_eck for Supported Types "
+msgstr "_Tuvasta toetatavad tüübid"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Tõmba uued sissetulevad kirjad"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Uute sõnumite kontroll"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Hilinenud ülesannete värvus"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Composing Messages"
-msgstr "Teadete tabel"
+msgid "Colors"
+msgstr "_Värvid"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Configuration"
-msgstr "Seadistus"
+msgid "Confirm _when expunging a folder"
+msgstr "Valiti fail, kui oodati kataloogi."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14896,349 +14886,316 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Lõpeta\"."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Default Behavior"
-msgstr "Fookuse käitumine"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:67
 #, fuzzy
-msgid "Default character _encoding:"
+msgid "Default character e_ncoding:"
 msgstr "Puuduvad sümbolid tekstikoodis"
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Deleting Mail"
-msgstr "Teile on kirju\n"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
+msgid "Defaults"
+msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "_Ära näita seda teadet uuesti"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Done"
 msgstr "valmis (D)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:73
 #, fuzzy
-msgid "Drafts _folder:"
+msgid "Drafts _Folder:"
 msgstr "Avab kataloog"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Email Accounts"
 msgstr "meili info"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Email _address:"
+msgid "Email _Address:"
 msgstr "E-posti aadress: "
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
-msgid "Empty _trash folders on exit"
+msgid "Empty trash folders on e_xit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Execute Command..."
 msgstr "%s: Vigane --execute käsklus `%s'\n"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "Renderdatava teksti laius"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Valikuvõimaluste menüü"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Font Properties"
 msgstr "Käivitaja häälestus"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Saada sõnum HTML formaadis"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
 #, fuzzy
-msgid "H_eaders"
+msgid "HTML Mail"
+msgstr "Saata HTML sõnum?"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Päis"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Käivita _failiga..."
 
-#: 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
 #, fuzzy
 msgid "Inline"
 msgstr "Saada sõnumi sees"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:69
-#, fuzzy
-msgid "Labels and Colors"
-msgstr "Kirjastiilid ja värvid"
-
-#: mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Loading Images"
-msgstr "Kõik pildid"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Meili konfiguratsioon"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Käivitaja asukoht"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sõnumi kuulajaskond"
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "Message Display"
-msgstr "Näita teadet"
-
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "Rakenda _fondid"
-
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "New Mail Notification"
-msgstr "Teile on uusi kirju\n"
-
-#: mail/mail-config.glade.h:81
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: mail/mail-config.glade.h:101
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-#, fuzzy
-msgid "Optional Information"
-msgstr "Valikuline info"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr " (peamise võtme ID %08lX)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Vali värvus"
 
-#: mail/mail-config.glade.h:90
-#, fuzzy
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
-
-#: mail/mail-config.glade.h:91
-#, fuzzy
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy"
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
+msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:109
 #, fuzzy
-msgid "Printed Fonts"
-msgstr "Rakenda _fondid"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "ei ole maildir vormingus kataloog"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Quote original message"
 msgstr "Teatel puudub algne tekst!"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "_Jäta see parool meelde"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Parooli meeldejätmine"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Kasutatav X'i kuva"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:117
 #, fuzzy
-msgid "Receiving _Options"
+msgid "Receiving Options"
 msgstr "Valikuvõimaluste menüü"
 
-#: mail/mail-config.glade.h:100
-#, fuzzy
-msgid "Remember this _password"
-msgstr "Jäta see parool meelde"
-
-#: mail/mail-config.glade.h:101
-#, fuzzy
-msgid "Required Information"
-msgstr "Kohustuslik info"
-
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Restore Defaults"
-msgstr "Taasta vaikeväärtused"
+msgid "Remember _password"
+msgstr "Parooli meeldejätmine"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "S_ecurity"
-msgstr "Turvalisus"
+msgid "S_tandard Font:"
+msgstr "Kirjatüübi kirjeldus"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:121
 #, fuzzy
-msgid "Secure MIME (S/MIME)"
-msgstr "S/MIME fail"
+msgid "Security"
+msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Vali..."
+
+#: mail/mail-config.glade.h:127
 #, fuzzy
 msgid "Sending Email"
 msgstr "meili info"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
-msgstr "Saadetud _sõnumite kaust:"
-
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:130
 #, fuzzy
-msgid "Sent and Draft Messages"
-msgstr "Vigane ülesande sõnum"
+msgid "Sent _Messages Folder:"
+msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:115
-#, fuzzy
-msgid "Server Configuration"
-msgstr "Konfiguratsioonifailid"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Serveri tüüp"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Allkiri:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "%d halba allkirja\n"
+
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Määra failinimi"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:137
 #, fuzzy
-msgid "Spell _Checking"
+msgid "Spell Checking"
 msgstr "Õigekirja kontroll"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Terminali kirjatüüp:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Tüüp:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:124
-msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
+#: mail/mail-config.glade.h:144
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h: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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "Use _Daemon"
 msgstr "Deemoni käivitamine..."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Eelistatud laius"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15249,198 +15206,112 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Järgmine\". "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Add Signature"
 msgstr "PGP allkiri"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr "L_ae pildid alati võrgust"
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
-
-#: mail/mail-config.glade.h:139
-#, fuzzy
-msgid "_Authentication Type: "
-msgstr "Blogi tüüp:"
-
-#: mail/mail-config.glade.h:140
-#, fuzzy
-msgid "_Authentication type: "
-msgstr "Blogi tüüp:"
-
-#: mail/mail-config.glade.h:141
-#, fuzzy
-msgid "_Automatically check for new mail every"
-msgstr "_Kontrolli uusi sõnumeid automaatselt"
-
-#: mail/mail-config.glade.h:142
-#, fuzzy
-msgid "_Automatically insert smiley images"
-msgstr "_Kontrolli uusi sõnumeid automaatselt"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:144
-#, fuzzy
-msgid "_Confirm when expunging a folder"
-msgstr "Valiti fail, kui oodati kataloogi."
-
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Default signature:"
-msgstr "PGP allkiri"
+msgid "_Always load images from the Internet"
+msgstr "L_ae pildid alati võrgust"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:158
 #, fuzzy
-msgid "_Defaults"
-msgstr "Vaikimisi"
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Enable"
 msgstr "enable"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: mail/mail-config.glade.h:152
-#, fuzzy
-msgid "_Full name:"
-msgstr "Täisnimi"
-
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "_HTML Mail"
-msgstr "Saata HTML sõnum?"
-
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "_Identity"
-msgstr "Identiteet"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "_P"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Local Tests Only"
 msgstr "Ainult kohalikke faile"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: 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 "_Ära lae ühtegi pilti võrgust"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Täpsustus, kui püütakse saata sõnumit ilma teemata"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
-msgid "_Receiving Mail"
-msgstr "Teile on kirju\n"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Kirjalaad"
 
-#: mail/mail-config.glade.h:170
-#, fuzzy
-msgid "_Restore defaults"
-msgstr "Taasta vaikeväärtused"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Script:"
 msgstr ", ISMAP skript"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Vali..."
-
-#: mail/mail-config.glade.h:173
-#, fuzzy
-msgid "_Sending Mail"
-msgstr "Meilisõnumi saatmine"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Näita animeeritud pilte"
 
-#: mail/mail-config.glade.h:175
-#, fuzzy
-msgid "_Signatures"
-msgstr "%d halba allkirja\n"
-
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Standard Font:"
-msgstr "Kirjatüübi kirjeldus"
-
-#: mail/mail-config.glade.h:177
-#, fuzzy
-msgid "_Terminal Font:"
-msgstr "_Terminali kirjatüüp:"
-
 #: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr "Turvaline %d-bitti %s (%s) HTTP ühendus"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minuti(t)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "värv"
+
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "description"
 msgstr "kirjeldus"
@@ -15450,21 +15321,21 @@ msgstr "kirjeldus"
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr "Viga \"%s\" kopeerimisel."
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr "Viga faili sulgemisel, viga : %s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 #, fuzzy
 msgid "Working"
 msgstr "_Töökataloog:"
@@ -15568,8 +15439,7 @@ msgstr "Konto nimi"
 msgid "Refreshing folder"
 msgstr "Avab kataloog"
 
-#: mail/mail-ops.c:1634
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Avab kataloog"
@@ -15590,50 +15460,54 @@ msgstr "Sõnumi kuulajaskond"
 
 #: mail/mail-ops.c:1838
 #, fuzzy, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Sõnumi kuulajaskond"
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Sõnumi kuulajaskond"
+msgstr[1] "Sõnumi kuulajaskond"
 
-#: mail/mail-ops.c:1922
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Salvestan %d sõnumit"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Salvestan %d sõnumit"
+msgstr[1] "Salvestan %d sõnumit"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1974
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Ei õnnestu avada läbimise vigade väljundfaili"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2002
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Kus näidata veateateid: \\w"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2090
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2120
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei õnnestu laadida."
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Ühendan uuesti LDAP serveriga..."
@@ -15652,94 +15526,86 @@ msgstr "Leia tõlgetest"
 msgid "Find:"
 msgstr "Otsing:"
 
-#: mail/mail-search.glade.h:5
-#, fuzzy
-msgid "Search"
-msgstr "Otsi"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "PGP allkiri"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "kasutatakse %s krüpteerimist\n"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Kas võtad vastu kehtivuse kaotanud turvainfo?"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Katkestan!!!"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "    tüüp: %s    %s  "
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Saata HTML sõnum?"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Katkesta kõik ootel allalaadimised?"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 #, fuzzy
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:396
-#: mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 #, fuzzy
 msgid "Waiting..."
 msgstr "viga %s oodates"
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Statistika faili ei saa lugeda."
 
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -15750,27 +15616,27 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 #, fuzzy
 msgid "_Discard changes"
 msgstr "Salvesta muudatused"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 #, fuzzy
 msgid "Save signature"
 msgstr "PGP allkiri"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 #, fuzzy
 msgid "Edit signature"
 msgstr "PGP allkiri"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Sisestage nimi uuele kataloogile: "
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 #, fuzzy
 msgid "Name:"
 msgstr "Nimi:"
@@ -15799,17 +15665,17 @@ msgstr "Edastatud sõnum"
 msgid "Invalid folder: `%s'"
 msgstr "Avab kataloog"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "%s: Viga signaali %s käsitleja ülesseadmisel: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15818,96 +15684,96 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 #, fuzzy
 msgid "vFolders"
 msgstr "_Kaust:"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "vKausta allikad"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Proovitake redigeerida olematut vkausta '%s'."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 #, fuzzy
 msgid "New VFolder"
 msgstr "vKausta allikad"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 #, fuzzy
 msgid "Seen"
 msgstr "Rootsi"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 #, fuzzy
 msgid "Lowest"
 msgstr "Madal"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 #, fuzzy
 msgid "Lower"
 msgstr "Alumine"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 #, fuzzy
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 #, fuzzy
 msgid "Highest"
 msgstr "Kõrgus:"
 
-#: 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 "Täna %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 #, fuzzy
 msgid "Generating message list"
 msgstr "Esitab sõnumeid jutulõngadena"
@@ -15965,8 +15831,7 @@ msgstr "Liiguta üles"
 msgid "For Your Information"
 msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
-#: mail/message-tag-followup.c:66
-#: ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
@@ -15975,14 +15840,12 @@ msgstr "Edasta"
 msgid "No Response Necessary"
 msgstr "Käsule %s ei tulnud vastust."
 
-#: mail/message-tag-followup.c:69
-#: ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:70
-#: ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -15991,8 +15854,7 @@ msgstr "Vasta kõigile"
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:281
-#: mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "ümardatud üles %u bitini\n"
@@ -16010,7 +15872,7 @@ msgstr ""
 
 #: mail/message-tags.glade.h:6
 #, fuzzy
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr "Grupeeritud:"
 
 #: mail/message-tags.glade.h:7
@@ -16096,15 +15958,20 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "If set to true, Evolution will start up in offline mode instead of online mode."
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "If set to true, the warning dialog in development versions of Evolution is not displayed."
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
@@ -16211,8 +16078,7 @@ msgstr ""
 msgid "The specified folder name is not valid: %s"
 msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
 
-#: shell/e-shell-folder-title-bar.c:592
-#: shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
@@ -16222,9 +16088,11 @@ msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
 #: shell/e-shell-importer.c:148
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
 #: shell/e-shell-importer.c:154
@@ -16232,8 +16100,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: 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 "Palun valige informatsioon, mida soovite importida:"
 
@@ -16245,8 +16112,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:228
-#: shell/e-shell-importer.c:259
+#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16260,29 +16126,27 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vali maatr_iks"
 
-#: shell/e-shell-importer.c:448
-#: shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Faili pole olemas"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 #, fuzzy
 msgid "Importing"
 msgstr "Impordin faile"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Impordin faile"
 
-#: shell/e-shell-importer.c:473
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel: %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16291,39 +16155,38 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "_Faili nimi:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 #, fuzzy
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Faili tüüp"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Impordi teiste programmide andmeid ja sätted"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Impordi failist"
 
 # !PARANDA!
-#: 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"
@@ -16332,23 +16195,22 @@ msgstr ""
 "Üritan tuvastada olemasolevaid programme"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 #, fuzzy
 msgid "Starting Intelligent Importers"
 msgstr "Vali importijad (samm 2/3)"
 
-#: 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 "Programmist %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr ""
@@ -16356,7 +16218,7 @@ msgstr ""
 "\n"
 "Info: %s"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "_Import"
@@ -16365,7 +16227,7 @@ msgstr "_Import"
 msgid "Closing connections..."
 msgstr "Sulgen ühendused..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Muuda Evolutioni seadeid "
@@ -16403,14 +16265,16 @@ msgstr "Ei saa avada kausta '%s'"
 msgid "Cannot find the specified shared folder."
 msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 #, fuzzy
 msgid "Starting import"
 msgstr "_Impordi järjehoidjad"
 
-#: 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 again before using Evolution.\n"
+"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 "
+"again before using Evolution.\n"
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
@@ -16463,33 +16327,38 @@ msgstr "Ximian Evolutionist"
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:395
-#: ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:408
-#: ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks vajuta seda nuppu."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse "
+"siirdumiseks vajuta seda nuppu."
 
 #: shell/e-shell-window.c:334
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
+"seda nuppu."
 
 #: shell/e-shell.c:537
 #, c-format
 msgid ""
 "Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of Evolution.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
 msgstr ""
 
 #: shell/e-shell.c:1063
@@ -16518,7 +16387,6 @@ msgstr "Kontrollkast"
 
 #: 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 "Uus"
 
@@ -16565,16 +16433,17 @@ msgstr "Loo uus vaade tööraamatust"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Active Connections"
+msgid "<b>Active Connections</b>"
 msgstr "%u aktiivset ühenduse avamist"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Ühenduste sulgemiseks ja offline reziimi siirdumiseks vajuta \"Olgu\""
+#, fuzzy
+msgid "Active Connections"
+msgstr "%u aktiivset ühenduse avamist"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Hetkel on aktiivsed järgnevad ühendused:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Ühenduste sulgemiseks ja offline reziimi siirdumiseks vajuta \"Olgu\""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
@@ -16691,29 +16560,28 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importijad"
 
-#: 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 "Impordi"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ära impordi"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ära küsi enam uuesti"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid järgnevatest failidest:"
 
 #. 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"
@@ -16733,7 +16601,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16741,87 +16609,83 @@ msgstr ""
 "Tänud\n"
 "Ximian Evolution'i meeskond\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
-#: shell/main.c:491
+#: shell/main.c:502
 #, fuzzy
 msgid "Start in online mode"
 msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127
-#: smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Imporditavate ridade arv"
 
-#: smime/gui/certificate-manager.c:238
-#: smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:545
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:246
-#: smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Edenemine"
 
-#: 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 "Seerianumber"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Lõpeb"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
@@ -16830,18 +16694,18 @@ msgstr "E-posti aadress"
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikaadivaatur: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Sisesta sisesta parool %s jaoks"
 
 #. we're setting the password initially
-#: smime/gui/component.c:64
+#: smime/gui/component.c:68
 #, fuzzy
 msgid "Enter new password for certificate database"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: smime/gui/component.c:66
+#: smime/gui/component.c:70
 #, fuzzy
 msgid "Enter new password"
 msgstr "Uus parool: "
@@ -16921,11 +16785,12 @@ msgid "Backup All"
 msgstr "Kogu päev"
 
 #: smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
-#: smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "I_mpordi sertifikaat"
@@ -17001,14 +16866,12 @@ msgstr "Organisatsiooniüksus (OÜ):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34
-#: smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 #, fuzzy
 msgid "SSL Client Certificate"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: smime/gui/smime-ui.glade.h:35
-#: smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 #, fuzzy
 msgid "SSL Server Certificate"
 msgstr "Tühistamise sertifikaat on loodud.\n"
@@ -17043,7 +16906,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
@@ -17054,12 +16918,12 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#: smime/lib/e-cert-db.c:582
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
-#: smime/lib/e-cert.c:234
-#: smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17177,14 +17041,12 @@ msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 msgid "Subject's Public Key"
 msgstr "halb avalik võti"
 
-#: smime/lib/e-cert.c:757
-#: smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Puhverkausta pole võimalik töödelda"
 
-#: smime/lib/e-cert.c:778
-#: smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 #, fuzzy
 msgid "Object Signer"
 msgstr "Kustuta objekt"
@@ -17236,8 +17098,7 @@ msgstr ""
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:888
-#: smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Mittesiduv"
@@ -17251,8 +17112,7 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
@@ -17321,6 +17181,9 @@ msgstr "On vaikimisi elemndi \"%s\" jaoks."
 
 #  This most likely means that KILL_PROCESS_CMD wasn't
 #  * found, so just bail completely.
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
 #: tools/killev.c:63
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
@@ -17335,8 +17198,7 @@ msgstr "Liiguta alla"
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopeeri kontakt(id) teise kausta..."
 
-#: ui/evolution-addressbook.xml.h:4
-#: ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopeerib valiku"
 
@@ -17344,8 +17206,7 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
@@ -17361,8 +17222,7 @@ msgstr "Liiguta kontakt(id) teise kausta..."
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: 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 "Kleebib lõikepuhvri"
 
@@ -17370,11 +17230,9 @@ msgstr "Kleebib lõikepuhvri"
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: 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-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:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
 
@@ -17422,24 +17280,17 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:33
-#: ui/evolution-comp-editor.xml.h:16
-#: ui/evolution-contact-editor.xml.h:13
+#: 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-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:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:35
-#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
@@ -17447,8 +17298,7 @@ msgstr "_Edasta kontakt..."
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:39
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
@@ -17457,14 +17307,10 @@ msgid "_Save as VCard"
 msgstr "_Salvesta VKaardina"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Otsi kontakte"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Vali _kõik"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Saada kontaktile sõnum..."
 
@@ -17472,58 +17318,55 @@ msgstr "_Saada kontaktile sõnum..."
 msgid "Day"
 msgstr "Päev"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Kustuta kõik sündmused"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Kustuta kohtumine"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Kustuta see kohtumine"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Kustuta see kohtumine"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Liigu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Liigub tagasi"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Liigub edasi"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Liigu _kuupäevale"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Aktiveerib valitud kuupäeva"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Liigu tänasele"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Loend"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Järgmine"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Previous"
+msgstr "Eelmine"
+
 #: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this calendar"
@@ -17534,8 +17377,7 @@ msgstr "   m   näidata sedasama menüüd"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: ui/evolution-calendar.xml.h:23
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
@@ -17546,45 +17388,63 @@ msgid "Purge old appointments and meetings"
 msgstr "Kohtumisi ja sündmusi sisaldav avalik kaust"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Vali kogu tekst"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Aktiveerib valitud kuupäeva"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Vali kalendrikaust"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Vaata loeteluna"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Näita ühte päeva"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Näitab ühte kuud"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Näitab ühte nädalat"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: 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 "Täna"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Eemaldab käesoleva puhvri vaate"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Nädal"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "Nimetu sündmus"
 
-#: ui/evolution-comp-editor.xml.h:2
-#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3
-#: ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:3
 msgid "Close"
 msgstr "Sulge"
@@ -17593,16 +17453,13 @@ msgstr "Sulge"
 msgid "Close this item"
 msgstr "Sulgeb elemendi"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 #, fuzzy
 msgid "Delete this item"
 msgstr "Kustuta see "
 
-#: ui/evolution-comp-editor.xml.h:6
-#: ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:11
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
 #, fuzzy
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
@@ -17611,28 +17468,24 @@ msgstr "Peatööriistariba"
 msgid "Preview the printed item"
 msgstr "Trükitava elemendi eelvaatlemine"
 
-#: ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 msgid "Print this item"
 msgstr "Eemalda see rida"
 
-#: ui/evolution-comp-editor.xml.h:11
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "_Salvesta kui..."
 
-#: ui/evolution-comp-editor.xml.h:12
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Salvesta ja sulge"
 
-#: ui/evolution-comp-editor.xml.h:13
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
@@ -17646,19 +17499,16 @@ msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
 msgid "Save this item to disk"
 msgstr "Salvestab elemendi kettale"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
-#: ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:27
 msgid "_File"
 msgstr "_Fail"
 
-#: ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
 #: ui/evolution-contact-list-editor.xml.h:14
 #: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:15
@@ -17670,8 +17520,7 @@ msgstr "_Salvesta"
 msgid "Copy selected text to the clipboard"
 msgstr "Kopeeri märgitud teksti lõikelauale"
 
-#: ui/evolution-composer-entries.xml.h:2
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
@@ -17683,8 +17532,7 @@ msgstr "Lõika valitud tekst lõikelauale"
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ui/evolution-composer-entries.xml.h:5
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -17738,13 +17586,11 @@ msgstr "Katkesta aktiivne ülesanne"
 msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3
-#: ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "_Edasta iKalendrina"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Edastab elemendi e-posti kaudu"
 
@@ -17835,14 +17681,12 @@ msgstr "_Filtrid..."
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
-#: ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopeeri märgitud teksti lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:3
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Lõika märgitud tekst lõikelauale"
@@ -17868,7 +17712,8 @@ msgid "Hide _Read Messages"
 msgstr "Viib valitud sõnumid ajutiselt peitu"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17880,8 +17725,7 @@ msgstr "Märgib kõik peitmata sõnumid loetuks"
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: ui/evolution-mail-list.xml.h:11
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab lõikepuhvrist ülesande"
@@ -17931,8 +17775,7 @@ msgstr "Esitab sõnumeid jutulõngadena"
 msgid "_Folder"
 msgstr "_Kaust"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "_Invert Selection"
 msgstr "Kopeeri valik"
@@ -18181,10 +18024,6 @@ msgstr "Liiguta"
 msgid "Move selected message(s) to another folder"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Järgmine"
-
 #: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Important Message"
@@ -18241,11 +18080,6 @@ msgstr "Eelmisele tähtsale sõnumile"
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:79
-#, fuzzy
-msgid "Previous"
-msgstr "Eelmine"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Trükib valitud sõnumi"
@@ -18407,8 +18241,7 @@ msgstr "Tsitaadina"
 msgid "_Resend..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution-mail-message.xml.h:129
-#: ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -18417,14 +18250,12 @@ msgstr "T_ööriistad"
 msgid "_Undelete"
 msgstr "_Taasta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Sulgeb akna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Close"
@@ -18438,8 +18269,7 @@ msgstr "Manusta"
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -18455,8 +18285,7 @@ msgstr "Krüpteeri sõnum PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:8
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "For_mat"
 msgstr "%s uuesti deklareerimine %s jaoks"
@@ -18711,41 +18540,41 @@ msgstr "Kopeeri valitud ülesanne"
 msgid "Cut selected task"
 msgstr "Kopeeri valitud ülesanne"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Kustuta valitud ülesanded"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Märgi valitud ülesanded lõpetatuks"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Asetab lõikepuhvrist ülesande"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Kuva ülesannete nimekiri"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Vaata valitud ülesannet"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "Ava _ülesanne"
 
@@ -18797,7 +18626,8 @@ msgstr "Saada / võta vastu"
 #: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Send queued items and retrieve new items"
-msgstr "Saadab järjekorras olevad väljaminevad kirjad ja tõmbab ära uued kirjad."
+msgstr ""
+"Saadab järjekorras olevad väljaminevad kirjad ja tõmbab ära uued kirjad."
 
 #: ui/evolution.xml.h:16
 #, fuzzy
@@ -18880,10 +18710,15 @@ msgid "_Day View"
 msgstr "_Päeva vaade"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Loeteluvaade"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Kuu vaade"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Töönädala vaade"
 
@@ -18915,10 +18750,15 @@ msgstr "_Sõnumid"
 
 #: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With _Category"
-msgstr "Suvaline kategooria"
+msgid "With _Due Date"
+msgstr "Tähtaeg:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Olekutekst"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ülesanded"
 
@@ -18938,7 +18778,8 @@ msgstr "Ajavööndid"
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 #, fuzzy
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Vasaku hiirenupuga saab kaarti suurendada ja ajavööndit valida.\n"
@@ -18981,16 +18822,10 @@ msgstr "ETKNRLP"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241
-#: widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Praegu"
 
-#: widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Täna"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
@@ -19003,87 +18838,88 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi väärtus peab olema 0 - 100."
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "balti"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Kesk-Euroopa"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "hiina"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kirillitsa"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "kreeka"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "heebrea"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "jaapani"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "korea"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "türgi"
 
-#: 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 "lääne-euroopa"
 
-#: 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 "lääne-euroopa"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "traditsiooniline"
 
-#: 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: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 "Lihtsustatud"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 #, fuzzy
 msgid "Ukrainian"
 msgstr "ukraina"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "visuaalne"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Tundmatu märgistik: %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 "Kodeering"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Sisesta kasutatav märgistik"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Muu..."
 
@@ -19110,7 +18946,9 @@ msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
 #: widgets/misc/e-expander.c:198
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr ""
 
 #: widgets/misc/e-expander.c:205
@@ -19149,6 +18987,11 @@ msgstr "Indikaatori asetsus"
 msgid "Spacing around expander arrow"
 msgstr ""
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Otsing"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
@@ -19159,18 +19002,15 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:92
-#: widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: widgets/misc/e-filter-bar.h:93
-#: widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "_Advanced..."
 msgstr "Täpsemalt"
@@ -19188,8 +19028,7 @@ msgstr "_Otsing"
 msgid "_Find Now"
 msgstr "Käivita nüüd"
 
-#: widgets/misc/e-search-bar.c:547
-#: widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Puhasta"
 
@@ -19222,3 +19061,252 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Aadressiraamatu allikad"
+
+#~ msgid "Selected:"
+#~ msgstr "Valitud:"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "Lisa kontaktide hulka"
+
+#~ msgid "Description"
+#~ msgstr "Kirjeldus"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "komponent"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmid"
+
+#, fuzzy
+#~ msgid "Geographical position"
+#~ msgstr "Geograafiline asukoht"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Iga %d. päeva"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Iga %d. nädala"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Igal %d. nädalal "
+
+#~ msgid "every %d months"
+#~ msgstr "Iga %d. kuul"
+
+#~ msgid "Every %d years"
+#~ msgstr "Iga %d. aastal"
+
+#~ msgid "Go To Date"
+#~ msgstr "Mine kuupäevale"
+
+#~ msgid "_Go To Today"
+#~ msgstr "_Mine tänasele"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Sisesta serveri nimi"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_Otsingu baas:"
+
+#, fuzzy
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "Kasutamata reeglid"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Redigeeri filtreid"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Redigeeri VKaustu"
+
+#~ msgid "Outgoing"
+#~ msgstr "Väljaminev"
+
+#, fuzzy
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Saada kontaktile sõnum"
+
+#~ msgid "Shell Command"
+#~ msgstr "Kesta käsk"
+
+#~ msgid "[script]"
+#~ msgstr "[skript]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Lisa allkirjaskript"
+
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Kohandatud kellaformaat"
+
+#, fuzzy
+#~ msgid "Index body contents"
+#~ msgstr "Vigane sõnumi sisu"
+
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Kohandatud kellaformaat"
+
+#, fuzzy
+#~ msgid "maildir"
+#~ msgstr "ei ole maildir vormingus kataloog"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "Üldine teave"
+
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "autentimine"
+
+#, fuzzy
+#~ msgid "Composing Messages"
+#~ msgstr "Teadete tabel"
+
+#, fuzzy
+#~ msgid "Configuration"
+#~ msgstr "Seadistus"
+
+#, fuzzy
+#~ msgid "Default Behavior"
+#~ msgstr "Fookuse käitumine"
+
+#, fuzzy
+#~ msgid "Deleting Mail"
+#~ msgstr "Teile on kirju\n"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "Valikuvõimaluste menüü"
+
+#, fuzzy
+#~ msgid "Labels and Colors"
+#~ msgstr "Kirjastiilid ja värvid"
+
+#, fuzzy
+#~ msgid "Loading Images"
+#~ msgstr "Kõik pildid"
+
+#, fuzzy
+#~ msgid "Message Display"
+#~ msgstr "Näita teadet"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "Rakenda _fondid"
+
+#, fuzzy
+#~ msgid "Optional Information"
+#~ msgstr "Valikuline info"
+
+#, fuzzy
+#~ msgid "Printed Fonts"
+#~ msgstr "Rakenda _fondid"
+
+#~ msgid "Re_member this password"
+#~ msgstr "_Jäta see parool meelde"
+
+#, fuzzy
+#~ msgid "Remember this _password"
+#~ msgstr "Jäta see parool meelde"
+
+#, fuzzy
+#~ msgid "Required Information"
+#~ msgstr "Kohustuslik info"
+
+#, fuzzy
+#~ msgid "Restore Defaults"
+#~ msgstr "Taasta vaikeväärtused"
+
+#, fuzzy
+#~ msgid "S_ecurity"
+#~ msgstr "Turvalisus"
+
+#, fuzzy
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "S/MIME fail"
+
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "Konfiguratsioonifailid"
+
+#, fuzzy
+#~ msgid "_Authentication Type: "
+#~ msgstr "Blogi tüüp:"
+
+#, fuzzy
+#~ msgid "_Authentication type: "
+#~ msgstr "Blogi tüüp:"
+
+#, fuzzy
+#~ msgid "_Default signature:"
+#~ msgstr "PGP allkiri"
+
+#, fuzzy
+#~ msgid "_Full name:"
+#~ msgstr "Täisnimi"
+
+#, fuzzy
+#~ msgid "_Identity"
+#~ msgstr "Identiteet"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "_P"
+
+#, fuzzy
+#~ msgid "_Receiving Mail"
+#~ msgstr "Teile on kirju\n"
+
+#, fuzzy
+#~ msgid "_Restore defaults"
+#~ msgstr "Taasta vaikeväärtused"
+
+#, fuzzy
+#~ msgid "_Sending Mail"
+#~ msgstr "Meilisõnumi saatmine"
+
+#, fuzzy
+#~ msgid "Search"
+#~ msgstr "Otsi"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "PGP allkiri"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "kasutatakse %s krüpteerimist\n"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Hetkel on aktiivsed järgnevad ühendused:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Otsi kontakte"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Liigu _kuupäevale"
+
+#~ msgid "Go to today"
+#~ msgstr "Liigu tänasele"
+
+#, fuzzy
+#~ msgid "With _Category"
+#~ msgstr "Suvaline kategooria"
diff --git a/po/eu.po b/po/eu.po
index c72586da00..6fb8aaa02a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Waliño <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -13,6 +13,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Editatu helbide-liburua"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Gorde honela"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Zereginak "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "Txartelik ez"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "txartel bat"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktuak "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _leihoa"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
@@ -102,61 +144,77 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Helbide-liburua"
 
-#: 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 "Ezabatu"
 
-#: 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 "Propietateak..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "Kontaktu berria:"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktuen zerrenda"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Helbide-liburua"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Helbide-liburua"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Sortu zeregin berria"
+
+#: addressbook/gui/component/addressbook-config.c:407
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Ezin da LDAP zerbitzariarekin konektatu."
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -164,27 +222,27 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
@@ -211,17 +269,17 @@ msgstr "%s eskaneatzen"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
@@ -270,7 +328,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -279,7 +337,7 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -289,7 +347,7 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -301,7 +359,7 @@ msgstr ""
 "programa konpilatu behar duzu CVS iturburuetatik\n"
 "beheko estekatik OpenLDAP eskuratuz.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -311,15 +369,15 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Ezin da helbide-liburua ireki"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -327,17 +385,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "Egutegiak bistaratuko duen URIa"
@@ -361,17 +419,11 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: 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
@@ -386,65 +438,56 @@ msgstr "_Begiratu zein mota onartzen diren"
 #: 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
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Helbide-liburuaren iturburuak"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Helbide-liburuaren iturburuak"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "_Helbide-liburuaren iturburuak..."
-
-#: 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
 #, fuzzy
 msgid "Always"
 msgstr "Alarmak"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anonimoa"
 
-#: 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"
@@ -452,61 +495,61 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Izen bereizitua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Email address:"
 msgstr "_Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: 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-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "_Bilatu:"
 
-#: 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 "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Taldea"
 
-#: 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
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
 
-#: 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"
@@ -516,32 +559,27 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Bat"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Selected:"
-msgstr "Ezabatuta"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -552,7 +590,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -561,7 +599,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -569,43 +607,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Iturburu-informazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: 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
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Onartzen ez den eskema"
 
-#: 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"
@@ -614,7 +652,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -622,7 +660,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -632,7 +670,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -642,13 +680,13 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -658,7 +696,7 @@ msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: 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 "
@@ -668,7 +706,7 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -678,7 +716,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -688,7 +726,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: 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"
@@ -696,30 +734,30 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -727,68 +765,56 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: 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 "_Edizioa"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ataka:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "_Search base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Zer_bitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "general-tab"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "searching-tab"
 msgstr "Bilaketa"
@@ -824,7 +850,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML mezua bidali?"
 
 #: 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 "Gehitu kontaktuei"
 
@@ -840,7 +866,7 @@ msgstr "Izena"
 
 #: 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 "Iturburua"
 
@@ -918,7 +944,8 @@ msgstr "Lankidetza"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -927,7 +954,7 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: 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 "Xehetasunak"
@@ -1019,16 +1046,27 @@ msgstr "Ka_tegoriak..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "E_zabatu..."
 
+#: 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 "_Edizioa"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
@@ -1074,8 +1112,8 @@ msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 #, fuzzy
 msgid "Address"
 msgstr "Helbi_dea:"
@@ -1083,14 +1121,14 @@ msgstr "Helbi_dea:"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 #, fuzzy
 msgid "Editable"
 msgstr "Gaitu"
@@ -2080,9 +2118,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 #, fuzzy
 msgid "Jabber"
 msgstr "Kontaktu-zerrenda izengabea"
@@ -2097,21 +2135,22 @@ msgid "MSN Messenger"
 msgstr "_Posta-mezua"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Zerbitzua prest"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "K_okalekua:"
@@ -2122,117 +2161,103 @@ msgid "Username"
 msgstr "_Erabiltzaile-izena:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Etxekoa"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Iturburua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 #, fuzzy
 msgid "Contact"
 msgstr "Kontaktuak"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 #, fuzzy
 msgid "Changed"
 msgstr "Txad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Kontuaren izena"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Kategoria-editorea ez dago erabilgarri."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Gorde kontaktua VCard gisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Lanekoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Taldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ezin izan da eremu baten trepeta aurkitu: `%s'"
@@ -2247,6 +2272,7 @@ msgid "_Edit Full"
 msgstr "Editatu osorik"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Izen osoa:"
@@ -2258,6 +2284,20 @@ msgstr ""
 "\n"
 "Helbide elektronikoa:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. helbidea:"
@@ -2363,25 +2403,28 @@ msgstr "_Titulua:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "_Kontu-izena:"
+msgid "Add IM Account"
+msgstr "Kontuak"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Kontuak"
+msgid "_Account name:"
+msgstr "_Kontu-izena:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Zerbitzua prest"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
 #, fuzzy
-msgid "Location:"
+msgid "_Location:"
 msgstr "K_okalekua:"
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr ""
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Kideak"
@@ -2404,27 +2447,28 @@ msgstr "Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 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
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #, fuzzy
 msgid "Is New List"
 msgstr "Zerrenda berria"
 
 #. 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 "Kontaktu-zerrendaren editorea"
 
-#: 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 "Gorde zerrenda VCard gisa"
 
@@ -2477,25 +2521,22 @@ msgid "No contacts"
 msgstr "Kontaktu berria"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Kontaktu berria"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Kontaktuak"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontaktuak"
+msgstr[1] "Kontaktuak"
 
-#: 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
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
@@ -2509,142 +2550,141 @@ msgstr "Molde"
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 #, fuzzy
 msgid "Name begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 #, fuzzy
 msgid "Email begins with"
 msgstr "honela amaitzen da"
 
-#: 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 "Kategoria da"
 
 #. 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 "Edozein eremuk hau dauka"
 
-#: 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 "Aurreratua..."
 
-#: 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 "Mota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: 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 "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: 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 "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Helbide-liburua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Helbide-liburua..."
 
-#: 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 "Ebaki"
 
-#. 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 "Kopiatu"
 
-#: 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 "Itsatsi"
 
-#: 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
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2653,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Edozein kategoria"
@@ -2687,8 +2727,6 @@ msgid "Car Phone"
 msgstr "Autoko telefonoa"
 
 #: 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 "Kategoriak"
 
@@ -2697,7 +2735,7 @@ msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Helb. el."
 
@@ -2751,6 +2789,7 @@ msgid "Manager"
 msgstr "Zuzendaria"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Telefono mugikorra"
 
@@ -2759,7 +2798,7 @@ msgid "Nickname"
 msgstr "Goitizena"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Oharra"
 
@@ -2768,7 +2807,7 @@ msgid "Office"
 msgstr "Bulegoa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Erakundea"
 
@@ -2826,19 +2865,19 @@ msgid "Web Site"
 msgstr "Web gunea"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 #, fuzzy
 msgid "Width"
 msgstr "Zabalera:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 #, fuzzy
 msgid "Height"
 msgstr "Altuera:"
 
 #: 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 ""
 
@@ -2895,93 +2934,96 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 #, fuzzy
 msgid "Selected"
 msgstr "Ezabatuta"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 #, fuzzy
 msgid "Has Cursor"
 msgstr "Zereginen ordena"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Kideak"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Cork"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Taldea"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Pownal"
+msgid "work"
+msgstr "Cork"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Pownal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "Kar_gua: "
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Etxeko faxa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Behar bezala egin da"
 
-#: 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
@@ -2989,101 +3031,101 @@ msgstr "Behar bezala egin da"
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Ez da txartela aurkitu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
-#: 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 "Bertan behera utzita"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: 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
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: 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
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3092,7 +3134,7 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3101,55 +3143,55 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 #, fuzzy
 msgid "Overwrite"
 msgstr "Fitxategia gainidatzi?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Errorea fitxategia gordetzean: %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 "zerrenda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
@@ -3186,36 +3228,33 @@ msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "eta beste %d txartel."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "eta beste txartel bat."
+msgid_plural "and %d other contacts."
+msgstr[0] "eta beste txartel bat."
+msgstr[1] "eta beste txartel bat."
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Gorde kontaktua VCard gisa"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Gorde helbide-liburuan"
 
@@ -3370,7 +3409,7 @@ msgstr "Marjinak"
 msgid "Number of columns:"
 msgstr "Zutabe-kopurua:"
 
-#: 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 "Aukerak"
 
@@ -3555,7 +3594,7 @@ msgid "Unnamed List"
 msgstr "Kontaktu-zerrenda izengabea"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
@@ -3643,7 +3682,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution-en mezu-prestatzailea."
 
 #: 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"
@@ -3691,24 +3730,24 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: 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 "Ireki"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3717,12 +3756,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Abisua"
 
-#: 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"
@@ -3734,7 +3773,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: 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 "
@@ -3751,7 +3790,7 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: 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 "Ez galdetu programa horri buruz berriro."
 
@@ -3927,13 +3966,13 @@ msgstr "Iruzkinak hau dauka"
 msgid "Location contains"
 msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
-#: 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 "Egutegia"
 
@@ -3955,7 +3994,7 @@ msgid "Purge events older than"
 msgstr "hau baino txikiagoa da"
 
 #: 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 "egun "
 
@@ -3966,7 +4005,7 @@ msgstr "%A, %Y %B %d"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3988,78 +4027,78 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Kaledonia berria"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 #, fuzzy
 msgid "M_eeting"
 msgstr "Bilera"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria."
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Kaledonia berria"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "Egutegia"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Sortu karpeta berria"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4089,11 +4128,6 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Ikuspegi pertsonalizatua"
-
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4113,16 +4147,16 @@ msgstr "Baimena ukatuta"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 #, fuzzy
 msgid "The type of view to show"
 msgstr "Aldatu ikuspegia -> %s"
@@ -4192,11 +4226,11 @@ msgstr ""
 msgid "extra times every"
 msgstr "bider, maiztasun honekin:"
 
-#: 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 "ordu "
 
-#: 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 "minutu "
 
@@ -4219,11 +4253,11 @@ msgstr "Oinarriak"
 msgid "Date/Time:"
 msgstr "Data/Ordua:"
 
-#: 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 "Bistaratu mezua"
 
-#: 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 "Jo soinua"
 
@@ -4232,18 +4266,17 @@ msgstr "Jo soinua"
 msgid "Reminders"
 msgstr "Oroigarria"
 
-#: 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 "Exekutatu programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#, fuzzy
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Bidali mezua"
 
 #: 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 "Laburpena:"
@@ -4274,7 +4307,7 @@ msgid "hour(s)"
 msgstr "ordu"
 
 #: 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 "minutu"
 
@@ -4284,8 +4317,8 @@ msgstr "hitzordu-hasiera baino"
 
 #. 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 "Gaituta"
 
@@ -4301,19 +4334,19 @@ msgstr "Ez kendu"
 
 #: 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 "Desgaitu"
 
 #: 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 "Gaitu"
 
@@ -4337,7 +4370,7 @@ msgstr "30 minutu"
 msgid "60 minutes"
 msgstr "60 minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4363,7 +4396,7 @@ msgid "Days"
 msgstr "egun"
 
 #: 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 "_Gaitu"
 
@@ -4461,7 +4494,7 @@ msgid "Wednesday"
 msgstr "Asteazkena"
 
 #: 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 "Lan-astea"
 
@@ -4509,7 +4542,6 @@ msgid "_Fri"
 msgstr "_Or."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Orokorra"
 
@@ -4607,7 +4639,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Z_ereginen zerrenda"
@@ -4753,28 +4785,28 @@ msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, fuzzy, c-format
 msgid "Validation error: %s"
 msgstr "Errore ezezaguna: %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 "- "
 
-#: 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 "(Eginda "
 
-#: 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 "Eginda "
 
-#: 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 "(Falta: "
 
-#: 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 "Falta: "
 
@@ -4811,8 +4843,9 @@ msgstr "Egunkariko sarrera - %s"
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: 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 "Gorde honela..."
 
@@ -4827,35 +4860,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Utzi bertan behera eragiketa"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Egutegia"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Z_ereginen zerrenda"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4884,19 +4902,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ziur zaude egunkariko sarrera izengabe hau ezabatu nahi duzula?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+#, 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] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+msgstr[1] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+#: 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] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+msgstr[1] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+#: 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] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+msgstr[1] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4964,7 +4988,7 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: 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 "Hitzordua"
 
@@ -5039,8 +5063,6 @@ msgstr "Egutegia"
 
 #: 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 "Sailkapena"
 
@@ -5096,13 +5118,13 @@ msgstr "_Hasiera-ordua:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -5160,13 +5182,13 @@ msgid "Member"
 msgstr "Kidea"
 
 #: 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
@@ -5359,7 +5381,7 @@ msgid "_No recurrence"
 msgstr "E_rrepikapenik ez"
 
 #: 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 "_Kendu"
 
@@ -5402,7 +5424,7 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: 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 ""
 
@@ -5411,6 +5433,28 @@ msgstr ""
 msgid "Save Event"
 msgstr "Egutegi-mezua"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Hautatu karpeta"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Egutegia"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Z_ereginen zerrenda"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Bileraren informazioa sortu da. Bidali?"
@@ -5443,39 +5487,39 @@ msgstr "% Osatuta"
 #: 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 "Eginda"
 
 #: 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 "Handia"
 
 #: 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 "Egiten ari da"
 
 #: 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 "Txikia"
 
 #: 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 "Normala"
 
 #: 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 "Ez da hasi"
 
@@ -5491,7 +5535,7 @@ msgstr "Definitu gabe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Osatze-data:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5535,9 +5579,9 @@ msgstr "Ezin da helbide-liburua ireki"
 msgid "Con_fidential"
 msgstr "Kon_fidentziala"
 
-#: 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 "Azalpena:"
 
@@ -5547,11 +5591,13 @@ msgid "Folder:"
 msgstr "_Karpeta:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Ha_siera-data:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Mugaeguna:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5610,139 +5656,112 @@ msgid "Weekly"
 msgstr "Astea"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d egun"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "egun bat"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d aste"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "aste bat"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d ordu"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "ordubete"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutu"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d egun"
+msgstr[1] "%d egun"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "minutu bat"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d aste"
+msgstr[1] "%d aste"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundo"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ordu"
+msgstr[1] "%d ordu"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "segundo bat"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutu"
+msgstr[1] "%d minutu"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Bidali mezua"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundo"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
 
-#: 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 hitzordua hasi aurretik"
 
-#: 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 hitzordua hasi ondoren"
 
-#: 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 hitzorduaren hasieran"
 
-#: 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 hitzordua amaitu aurretik"
 
-#: 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 hitzordua amaitu ondoren"
 
-#: 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 hitzorduaren amaieran"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s - %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 "abiarazle-mota ezezagunaren %s"
 
-#: 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 "Publikoa"
 
-#: 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 "Pribatua"
 
-#: 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 "Konfidentziala"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Azalpena:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Amaiera-eguna"
 
-#: 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 "Hasiera-data"
 
-#: 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 "Laburpena"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-#, fuzzy
-msgid "color"
-msgstr "kolorea"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Hitzordua"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Libre"
@@ -5778,145 +5797,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 "Bai"
 
-#: 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 "Ez"
 
 #. 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 "Ezezaguna"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Hautatutako objektuak ezabatzen"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Objektuak eguneratzen"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Hitz_ordu berria..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Egun osoko gertaera _berria"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-#, fuzzy
-msgid "New Meeting"
-msgstr "Bilera berria"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Zeregin berria"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Inprimatu..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Itsatsi"
-
-#: 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 "_Joan gaurko egunera"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Joan data jakin batera..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Argitaratu libre/okupatuta informazioa"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Ireki"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "_Gorde honela..."
-
-#: 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 "E_baki"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "Ko_piatu"
-
-#: calendar/gui/e-cal-view.c:1295
-#, fuzzy
-msgid "_Schedule Meeting..."
-msgstr "Antolatu _bilera"
-
-#: calendar/gui/e-cal-view.c:1296
-#, fuzzy
-msgid "_Forward as iCalendar..."
-msgstr "Birbidali _iCalendar gisa"
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Ezabatu _agerraldi hau"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Ezabatu agerraldi _guztiak"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Postaren ezarpenak..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "%0"
@@ -5961,36 +5874,89 @@ 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 "Hautatutako objektuak ezabatzen"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Objektuak eguneratzen"
+
+#: 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 "_Ireki"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Ireki mezua"
 
-#: 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 "_Gorde honela..."
+
+#: 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 "_Inprimatu..."
+
+#: 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 "E_baki"
+
+#: 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 "Ko_piatu"
+
+#: 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 "_Itsatsi"
+
+#: calendar/gui/e-calendar-table.c:1053
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: 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 "_Ezabatu hautatutako zereginak"
 
-#: 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 "Egin klik zeregina gehitzeko"
 
@@ -5999,38 +5965,105 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "% Complete"
 msgstr "% Osatuta"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmak"
-
-#: 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 "Eginda"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Egite-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Mugaeguna"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Kokaleku geografikoa"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Hasiera-data"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URLa"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "Hitz_ordu berria..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Egun osoko gertaera _berria"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#, fuzzy
+msgid "New Meeting"
+msgstr "Bilera berria"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Zeregin berria"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Hautatu _haria"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Ezabatu..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Argitaratu libre/okupatuta informazioa"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Kopiatu karpeta honetan..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Eraman karpeta honetara..."
+
+#: calendar/gui/e-calendar-view.c:1276
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Antolatu _bilera"
+
+#: calendar/gui/e-calendar-view.c:1277
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Birbidali _iCalendar gisa"
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Ezabatu _agerraldi hau"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Ezabatu agerraldi _guztiak"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "_Joan gaurko egunera"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Joan data jakin batera..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Postaren ezarpenak..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6062,26 +6095,26 @@ msgstr "%02i minutu-zatiketa"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
 #. 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"
@@ -6091,428 +6124,420 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Errepikapen _soila"
 
-#: calendar/gui/e-itip-control.c:603
-#, fuzzy
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Errepikatze-aldia"
+msgid_plural "Every %d days"
+msgstr[0] "Errepikatze-aldia"
+msgstr[1] "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, fuzzy, c-format
-msgid "Every %d days"
-msgstr "%d egun"
-
-#: calendar/gui/e-itip-control.c:611
-#, fuzzy
 msgid "Every week"
-msgstr "Errepikatze-aldia"
+msgid_plural "Every %d weeks"
+msgstr[0] "Errepikatze-aldia"
+msgstr[1] "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, fuzzy, c-format
-msgid "Every %d weeks"
-msgstr "%d aste"
-
-#: calendar/gui/e-itip-control.c:616
-#, fuzzy
 msgid "Every week on "
-msgstr "Evergreen"
-
-#: calendar/gui/e-itip-control.c:618
-#, fuzzy, c-format
-msgid "Every %d weeks on "
-msgstr "%d aste"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Evergreen"
+msgstr[1] "Evergreen"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 #, fuzzy
 msgid " and "
 msgstr "Harea"
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
-#, fuzzy
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "Hi_labete"
+msgid_plural "every %d months"
+msgstr[0] "Hi_labete"
+msgstr[1] "Hi_labete"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
-#, fuzzy
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Errepikatze-aldia"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] "Errepikatze-aldia"
+msgstr[1] "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: 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 "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
+#: calendar/gui/e-itip-control.c:930
+#, fuzzy
+msgid "Location:"
+msgstr "K_okalekua:"
+
 #. 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 "Egoera:"
 
-#: 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 "Onartua"
 
-#: 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 "Oraingoz onartua"
 
-#: 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 "Ukatua"
 
-#: 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 "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Eguneratu"
 
-#: 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 "Ados"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: 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>(e)k bilera-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: 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>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: 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>(e)k bilera batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: 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>(e)k bilera-informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: 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>(e)k bilera-eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: 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>(e)k bilera bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: 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>(e)k mezu ulertezina bidali du."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: 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>(e)k zeregin-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: 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>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: 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>(e)k zeregin batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: 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>(e)k zereginaren informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: 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>(e)k zeregin-esleipenari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: 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>(e)k zeregina bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: 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>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: 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>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: 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>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: 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 "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\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 "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: 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 "Elementua bidali da!\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 "Elementua ezin izan da bidali!\n"
 
@@ -6648,7 +6673,7 @@ msgstr "%a, %Y/%m/%d"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -6734,12 +6759,12 @@ msgstr "_Lehentasuna:"
 msgid "Web Page:"
 msgstr "Orrialdea"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Egin klik zeregina gehitzeko"
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6747,7 +6772,7 @@ msgid ""
 msgstr "Errorea %s abiaraztean"
 
 #. 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"
@@ -6755,61 +6780,63 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Errorea %s abiaraztean"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Kargatu iru_diak"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Kargatu iru_diak"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Hitzordurik ez"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Kargatu iru_diak"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "'%s' irekitzen"
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6831,45 +6858,46 @@ msgid "February"
 msgstr "otsaila"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Joan data jakin batera"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "urtarrila"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "uztaila"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "ekaina"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "martxoa"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "maiatza"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "azaroa"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "urria"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Hautatu izenak"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "iraila"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Joan gaurko egunera"
+msgid "_Select Today"
+msgstr "Hautatu karpeta"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6953,7 +6981,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7110,81 +7138,81 @@ msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: 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, %Y %d"
 
-#: 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, %Y %b %d"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Zeregina"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontaktuak "
 
-#: 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 "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
@@ -7193,39 +7221,39 @@ msgstr "Prestatu inprimaketa"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "Z_ereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "Z_ereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8884,7 +8912,7 @@ msgstr "Ezin da cache-bidea sortu"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ezin izan da kendu cache-sarrera: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8895,7 +8923,7 @@ msgstr ""
 "Zerbitzari honetako eragiketa gehiago ez zaizu erantzungo \n"
 "sarera berriz konektatzen zarenean."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8906,7 +8934,7 @@ msgstr ""
 "%s\n"
 "Fitxategi honetan egindako aldaketak ez dira birsinkronizatuko."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Zerbitzariarekin birsinkronizatzen"
 
@@ -8923,7 +8951,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "%s karpeta biltegiratzen"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
@@ -9040,31 +9068,35 @@ msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Mezuak eramaten"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 #, fuzzy
 msgid "Copying messages"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d mezu berreskuratzen"
@@ -9094,7 +9126,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 "Bertan behera utzita."
 
@@ -9474,7 +9507,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -9683,7 +9716,7 @@ msgstr "Beste errore bat"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
@@ -9692,21 +9725,22 @@ msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ekaina"
@@ -9940,17 +9974,17 @@ msgstr "%s mezurik ez dago %s(e)n"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9987,33 +10021,32 @@ msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Zerbitzari-izena"
+msgid "Address Book And Calendar"
+msgstr "Helbide-liburua"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "Bilaketa-_oinarria:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Pasahitza"
 
-#: 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."
@@ -10021,8 +10054,8 @@ msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Lainobera itxia"
@@ -10030,12 +10063,12 @@ msgstr "Lainobera itxia"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
@@ -10091,12 +10124,12 @@ msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: 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
@@ -10112,25 +10145,25 @@ msgstr ""
 "Ezin da mezua hartu: %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 "Ez dago horrelako mezurik"
 
-#: 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 "Mezu hau orain ez dago erabilgarri "
 
-#: 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 "Mezu berrien laburpen-informazioa bilatzen"
 
-#: 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 "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -10206,18 +10239,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s zerbitzua %s(e)rako %s(e)n"
 
-#: 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
@@ -10227,14 +10260,14 @@ msgstr "%s zerbitzua %s(e)rako %s(e)n"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %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 ""
 
-#: 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
@@ -10242,54 +10275,54 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %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
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10300,32 +10333,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
@@ -10358,20 +10392,20 @@ msgid "Index message body data"
 msgstr "Bidali mezua kontaktuari"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -10431,7 +10465,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"
@@ -10480,8 +10514,8 @@ msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
@@ -10511,14 +10545,14 @@ msgstr "Mezu-eduki baliogabea"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' karpeta ez dago."
@@ -10537,7 +10571,7 @@ msgstr "`%s' ez da maildir direktorioa."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
@@ -10546,30 +10580,30 @@ msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %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 "Ezin da maildir direktorioaren bide-izena ireki: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: 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
@@ -10617,7 +10651,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Ezin da izen horretako karpetarik sortu"
@@ -10648,32 +10682,32 @@ msgstr "`%s' ez da fitxategi erregularra."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
@@ -10719,7 +10753,7 @@ msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
@@ -10762,14 +10796,14 @@ msgstr "MH mezua eranstea bertan behera utzi da"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Ezin izan da `%s' karpeta sortu:\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Ezin da karpeta hartu: %s: %s"
@@ -11051,47 +11085,47 @@ msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Errore ezezaguna: %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 "Karpeta ez dago: %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 "Ezin izan da taldea hartu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Ezin izan da mezua eskuratu: %s"
 
-#: 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 komandoak huts egin du: %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: Mezu berrien bila eskaneatzen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Zerbitzari-erantzun ezezaguna: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Utzi bertan behera"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
@@ -11138,7 +11172,7 @@ msgstr "Ezabatu %s egunen ondoren"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11230,7 +11264,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11283,12 +11317,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta-banaketa sendmail programaren bidez"
 
-#: 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 "SMTP erabiliz urruneko mailhub batekin konektatuta posta banatzeko.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11412,13 +11447,13 @@ msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "AUTH eskaera denboraz kanpo: %s"
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP komandoak huts egin du: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
-msgid "STARTTLS response error"
-msgstr "DATA erantzunaren errorea"
+msgid "STARTTLS command failed"
+msgstr "IMAP komandoak huts egin du: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
@@ -11453,155 +11488,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da zehaztu."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: 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 "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, fuzzy, c-format
-msgid "HELO request timed out: %s"
-msgstr "RSET eskaera denboraz kanpo: %s"
+msgid "HELO command failed: %s"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
+#: camel/providers/smtp/camel-smtp-transport.c:960
 #, fuzzy
-msgid "HELO response error"
-msgstr "RSET erantzunaren errorea"
+msgid "HELO command failed"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: 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 eskaera denboraz kanpo: %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 komandoak huts egin du: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH eskaerak huts egin du."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP komandoak huts egin du: %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 "Zerbitzariak autentifikazio-erantzun txarra eman du.\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 eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM erantzunaren errorea"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO erantzunaren errorea: %s: posta ez da bidali"
 
-#: 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> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
+#: 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 erantzunaren errorea: %s: posta ez da bidali"
 
 #. 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 erantzunaren errorea"
-
-#: 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 bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA amaitze-erantzunaren errorea"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP komandoak huts egin du: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET eskaera denboraz kanpo: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET erantzunaren errorea"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, fuzzy, c-format
-msgid "QUIT request timed out: %s"
-msgstr "AUTH eskaera denboraz kanpo: %s"
+msgid "QUIT command failed: %s"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT erantzunaren errorea"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP komandoak huts egin du: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: 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 "eranskina"
 
-#: 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 "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: 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 "Ezin da %s fitxategia erantsi: %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 "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
@@ -11624,24 +11661,24 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Identitatea konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
 msgstr "Azalpenik ez"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -11652,45 +11689,45 @@ msgstr "Egin klik hemen helbide-liburura joateko"
 #. * 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 "Erantzun honi:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: 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 "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: 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."
@@ -11701,12 +11738,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<egin klik hemen karpeta hautatzeko>"
@@ -11716,20 +11753,20 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategi bat"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Ezin da mezua enkriptatu: ez dago testu soilik enkriptatzeko"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11738,30 +11775,30 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: 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 "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11770,7 +11807,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11779,7 +11816,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11788,7 +11825,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11797,7 +11834,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11806,7 +11843,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11818,43 +11855,48 @@ msgstr ""
 "Aldaketak gorde nahi dituzu?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mezu izengabea)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2084
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: 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."
@@ -11862,7 +11904,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11873,7 +11915,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: 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."
@@ -11881,7 +11923,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12004,7 +12046,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12012,15 +12054,15 @@ msgstr ""
 "Izen hori duen fitxategia badago lehendik.\n"
 "Gainidatzi?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Gogoratu pasahitz hau"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -12103,13 +12145,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12118,100 +12160,81 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "segundo bat"
+msgid_plural "%d seconds ago"
+msgstr[0] "segundo bat"
+msgstr[1] "segundo bat"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, fuzzy, c-format
-msgid "%d seconds ago"
-msgstr "%d segundo"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
 msgid "1 minute ago"
-msgstr "minutu bat"
+msgid_plural "%d minutes ago"
+msgstr[0] "minutu bat"
+msgstr[1] "minutu bat"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, fuzzy, c-format
-msgid "%d minutes ago"
-msgstr "%d minutu"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
 msgid "1 hour ago"
-msgstr "ordubete"
+msgid_plural "%d hours ago"
+msgstr[0] "ordubete"
+msgstr[1] "ordubete"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, fuzzy, c-format
-msgid "%d hours ago"
-msgstr "%d ordu"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
 msgid "1 day ago"
-msgstr "egun bat"
+msgid_plural "%d days ago"
+msgstr[0] "egun bat"
+msgstr[1] "egun bat"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, fuzzy, c-format
-msgid "%d days ago"
-msgstr "lehenago"
-
-#: filter/filter-datespec.c:69
-#, fuzzy
 msgid "1 week ago"
-msgstr "aste bat"
+msgid_plural "%d weeks ago"
+msgstr[0] "aste bat"
+msgstr[1] "aste bat"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, fuzzy, c-format
-msgid "%d weeks ago"
-msgstr "%d aste"
-
-#: filter/filter-datespec.c:70
-#, fuzzy
 msgid "1 month ago"
-msgstr "hilabete "
-
-#: filter/filter-datespec.c:70
-#, fuzzy, c-format
-msgid "%d months ago"
-msgstr "lehenago"
+msgid_plural "%d months ago"
+msgstr[0] "hilabete "
+msgstr[1] "hilabete "
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, c-format
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, fuzzy, c-format
-msgid "%d years ago"
-msgstr "lehenago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Data aukeratzea ahaztu zaizu."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<egin klik hemen data hautatzeko>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "orain"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a, %Y %b %d"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Iragazteko arauak"
 
 #: filter/filter-file.c:166
@@ -12219,28 +12242,29 @@ msgstr "Iragazteko arauak"
 msgid "You must specify a file name."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 #, fuzzy
 msgid "Choose a file"
 msgstr "Aukeratu ekintza bat:"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Orduan"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "Eginda "
 
 #: filter/filter-folder.c:153
 #, fuzzy
 msgid "You must specify a folder."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: 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 "Hautatu karpeta"
 
@@ -12254,25 +12278,25 @@ 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 "Garrantzitsua"
 
 #. 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
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. 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
 #, fuzzy
 msgid "Later"
 msgstr "geroago"
 
-#: 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 "Proba"
 
@@ -12280,60 +12304,64 @@ msgstr "Proba"
 msgid "You must name this filter."
 msgstr "Iragazkiari izena eman behar diozu."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Arau-izena: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Izengabea"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Baldin eta"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "Eginda "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Exekutatu ekintzak"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "irizpide guztiak betetzen badira"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "irizpideren bat betetzen bada"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "sarrerakoa"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "irteerakoa"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Konparazio-ordua:"
+msgid "    "
+msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Editatu iragazkiak"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Iragazteko arauak"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Editatu karpeta birtualak"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Karpeta birtualen iturburuak"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Konparazio-ordua:"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Sarrerakoa"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Irteerakoa"
-
-#: filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12342,7 +12370,7 @@ msgstr ""
 "Mezuaren data zuk hemen zehazten duzun orduarekin\n"
 "konparatuko da."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12352,7 +12380,7 @@ msgstr ""
 "orduarekiko erlazioan konparatuko da;\n"
 "\"bi aste lehenago\", adibidez."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12361,60 +12389,52 @@ msgstr ""
 "Mezuaren data zuk hemen zehazten duzun orduarekin\n"
 "konparatuko da."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Karpeta birtualak"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "uneko orduarekiko erlatiboa den ordua"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "lehenago"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "hilabete "
 
-#: 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 "segundo "
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "zehaztutako karpetak bakarrik"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "uneko ordua"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 #, fuzzy
 msgid "the time you specify"
 msgstr "zuk zehaztutako ordua"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "Karpeta birtualen iturburuak"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "aste "
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "urruneko karpeta aktibo guztiekin"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "karpeta lokal guztiekin"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "urte "
 
@@ -12551,7 +12571,7 @@ msgstr "ez da Banderaduna"
 msgid "Junk Test"
 msgstr "ekaina"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12585,8 +12605,8 @@ msgstr "Eraman karpeta honetara"
 
 #: filter/libfilter-i18n.h:44
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Exekutatu shell komandoa"
+msgid "Pipe to Program"
+msgstr "Programatik irten"
 
 #: filter/libfilter-i18n.h:45
 #, fuzzy
@@ -12624,24 +12644,24 @@ msgstr "hau baino handiagoa da"
 msgid "returns less than"
 msgstr "hau baino txikiagoa da"
 
-#: 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 "Ireki programa:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:56
-#, fuzzy
-msgid "Shell Command"
-msgstr "Exekutatu shell komandoa"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
@@ -12666,9 +12686,9 @@ msgstr "honela hasten da"
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Gaia"
@@ -12678,17 +12698,13 @@ msgstr "Gaia"
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Arauak"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Gehitu araua"
 
@@ -12701,8 +12717,9 @@ msgstr "Editatu araua"
 msgid "Rule name"
 msgstr "Arau-izena: "
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Puntuazio-arauak"
 
 #: filter/searchtypes.xml.h:1
@@ -12737,15 +12754,20 @@ msgstr "gaiak hau dauka"
 msgid "Subject does not contain"
 msgstr "gaiak ez dauka hau"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Karpeta birtualak"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Karpeta birtualari izena eman behar diozu."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 #, fuzzy
 msgid "VFolder source"
 msgstr "Karpeta birtualen iturburuak"
@@ -12804,8 +12826,8 @@ msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
 msgid "Evolution Mail preferences control"
 msgstr "Evolution-en postaren laneko laburpenaren osagaia."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Posta"
@@ -12815,62 +12837,57 @@ msgstr "Posta"
 msgid "Mail Accounts"
 msgstr "Kontuak"
 
-#: 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
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Egutegi-hobespenak"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Ez ezabatu"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 #, fuzzy
 msgid "[Default]"
 msgstr "Lehenetsi"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontu-izena:"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: 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
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontaktu izengabea"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-#, fuzzy
-msgid "[script]"
-msgstr "Azalpenik ez"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 #, fuzzy
 msgid "Language(s)"
 msgstr "Hizkuntza"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:1000
 #, fuzzy
-msgid "Add script signature"
-msgstr "Gehitu irizpidea"
+msgid "Add signature script"
+msgstr "Ezabatu dena sinadura izan ezik"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Sinadura-fitxategia:"
@@ -12927,7 +12944,7 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
@@ -12962,312 +12979,342 @@ msgstr "Hurrengo irakurri gabeko mezua"
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Sortu _karpeta berria...."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Karpeta-izena:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "%s karpeta kentzen"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "%s karpeta irekitzen"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Mezuak %s(e)ra eramaten"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Mezuak %s(e)n kopiatzen"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "%s karpeta biltegiratzen"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Ezabatu '%s' karpeta"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ezabatu \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr ""
 "Ezin izan zaio izena aldatu karpetari: %s: ez dago horrelako karpetarik"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "I_kusi"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ireki leiho berrian"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Eraman"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Kar_peta berria"
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Iragazteko arauak"
+
+#: mail/em-folder-view.c:785
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Lehenetsi"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik zeregina gehitzeko"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Bat datozenak:"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Esleitua"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13275,12 +13322,12 @@ msgid ""
 msgstr ""
 "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13288,104 +13335,104 @@ msgid ""
 msgstr ""
 "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Etenda"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Enkriptatutako mezua"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP enkriptatzea"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Enkriptatutako mezua"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 #, fuzzy
 msgid "Overdue:"
 msgstr "A_tzeratutako zereginak:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Ezkutatu"
@@ -13395,129 +13442,165 @@ msgstr "Ezkutatu"
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%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 "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Mezuak eramaten"
 
-#: 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 "Nork"
 
-#: 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 "Erantzun honi"
 
-#: 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 "Nori"
 
-#: 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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: 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 eranskina"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: 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 "Barne-errorea: uid formatu baliogabean: %s"
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Onartzen ez den eskema"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Barne-errorea: uid formatu baliogabean: %s"
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Errepikatze-aldia"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "E_gun bat"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "_Astebete"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Hi_labete"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13526,22 +13609,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
@@ -13584,34 +13667,34 @@ msgstr "Gehitu helbide-liburua"
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: 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 "Karpeta"
 
 #. 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 "Hautatu zerbitzari bat."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13620,29 +13703,29 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Birbidalitako mezua"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 "Jatorrizko mezua:\n"
 "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13651,7 +13734,7 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13660,38 +13743,38 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Mezua"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gorde mezua honela..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "Helbi_dea:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13704,7 +13787,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13784,277 +13867,311 @@ msgstr "Ebaki hautatutako mezuak"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Ebaki hautatutako mezuak"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "Birbidaltzeko estilo lehenetsia: "
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: 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 "Erakutsi/ezkutatu karpeta-barra "
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Bidali mezua geroago"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Kontuak"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Erakutsi ordua honela"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Erakutsi ordua honela"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Au_rrebistako panela"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "Jatorrizko kontaktua:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -14062,113 +14179,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Hari bateko mezuen zerrenda"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Hari bateko mezuen zerrenda"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "Aldakorra"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Inportatu"
@@ -14212,14 +14329,14 @@ msgstr "Elm posta zaharra inportatzen ari da Evolution"
 #: 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 "Inportatzen..."
 
 #: 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 "Itxaron"
 
@@ -14268,12 +14385,12 @@ msgstr "Fitxategiak inportatzen"
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Lehentasuna: %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"
@@ -14288,7 +14405,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14296,7 +14413,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14305,25 +14422,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editatu iragazkiak"
 
-#: 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?"
@@ -14356,64 +14473,29 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Biltegiaren uneko formatua:"
-
-#: mail/local-config.glade.h:2
-#, fuzzy
-msgid "Index body contents"
-msgstr "Gorputzaren edukia"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Biltegiaren formatu berria:"
-
-#: 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 ""
-"Oharra: Postontzi-formatu batetik bestera bihurtzerakoan gerta\n"
-"daitezkeen hutsegiteak (adibidez, diskoa betetzea) beharbada\n"
-"ezingo dira automatikoki berreskuratu.  Kontuz ibili, beraz."
-
-#: 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 "Ez duzu eman eskatu zaizun informazio guztia."
 
 #. 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-en kontu-editorea"
 
-#: 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 "_Ostalaria:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: 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 "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
@@ -14446,11 +14528,11 @@ msgstr "Erantzunda"
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazkiaren araua"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14462,48 +14544,48 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Prestatu mezua"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Karpeta birtual berria"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editatu iragazkiak"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: 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 "Identitatea"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14514,12 +14596,13 @@ msgstr ""
 "eremuak bete gabe utz ditzakezu.\n"
 "Betetzen badituzu, datu horiek zuk bidaltzen dituzun mezuetan agertuko dira."
 
-#: 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
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14529,16 +14612,16 @@ msgstr ""
 "bazaude, galdetu sistemaren\n"
 "administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14548,11 +14631,11 @@ msgstr ""
 "bazaude, galdetu\n"
 "sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: 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 "Kontuaren kudeaketa"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14569,133 +14652,263 @@ msgstr ""
 "Bistaratzeko \n"
 "bakarrik erabiliko da kontu-izen hori."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: 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 "Zerbitzariarekin konektatzen..."
 
-#: 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 "_Begiratu zein mota onartzen diren"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Aurrebista"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "Egoera:"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Hizkuntza"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Mezu berririk dagoen begiratzen"
+
+#: mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+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
+#, fuzzy
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "Bistaratuko den mezua"
+
+#: 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 "Mezu berrien jakinarazpena"
+
+#: 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 "Bidalitako mezuak eta zirriborroak"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Account Editor"
 msgstr "%d kontua"
 
-#: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Kontuaren informazioa"
-
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:36
 #, fuzzy
-msgid "Add Sc_ript"
-msgstr "Gehitu irizpidea"
+msgid "Add Ne_w Signature..."
+msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:37
 #, fuzzy
-msgid "Add new signature..."
-msgstr "Gorde sinadura"
+msgid "Add _Script"
+msgstr "Gehitu irizpidea"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Beti bidali Cc kopia honi:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Beti bidali Cc kopia honi:"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Attach original message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: 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 "Eranskina"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autentifikazioa"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Automatikoki begiratu mezu berririk"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "Egin bip mezu berriak iristen direnean"
+
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:52
 #, fuzzy
-msgid "C_olors"
-msgstr "_Itxi"
+msgid "Ch_eck for Supported Types "
+msgstr "_Begiratu zein mota onartzen diren"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Mezu berririk dagoen begiratzen"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Gaurko zereginen kolorea"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Mezuak prestatzen"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Itxi"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Konfigurazioa"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14712,334 +14925,303 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Default Behavior"
-msgstr "Lehentasun lehenetsia:"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:67
 #, fuzzy
-msgid "Default character _encoding:"
+msgid "Default character e_ncoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Deleting Mail"
-msgstr "Mezuak bilatzen"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+msgid "Defaults"
+msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: 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 "Eginda"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:73
 #, fuzzy
-msgid "Drafts _folder:"
+msgid "Drafts _Folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Helb. el.ak hau dauka"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Email _address:"
+msgid "Email _Address:"
 msgstr "_Helbide elektronikoa:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
-msgid "Empty _trash folders on exit"
+msgid "Empty trash folders on e_xit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "honela amaitzen da"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Aukerak"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietateak"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "HTML postan"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "Goiburukoa"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Aipuak nabarmentzeko erabili "
 
-#: 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 "Barnean"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:69
-#, fuzzy
-msgid "Labels and Colors"
-msgstr "Gorde eta itxi"
-
-#: mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Loading Images"
-msgstr "Kargatu iru_diak"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "Message Display"
-msgstr "_Mezu-bistaratzea"
-
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "mezuak hau dauka"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Mezu berrien jakinarazpena"
-
-#: 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"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Aukerako informazioa"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
 #, fuzzy
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
-
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+msgid "Play sound file when new mail arri_ves"
+msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:109
 #, fuzzy
-msgid "Printed Fonts"
-msgstr "Inprimatu hautatutako kontaktuak"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: 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
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "_Gogoratu pasahitz hau"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Erantzun honi:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:117
 #, fuzzy
-msgid "Receiving _Options"
+msgid "Receiving Options"
 msgstr "Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Remember this _password"
+msgid "Remember _password"
 msgstr "Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Beharrezko informazioa"
-
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "Restore Defaults"
-msgstr "Lehenespenak"
+msgid "S_tandard Font:"
+msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:121
 #, fuzzy
-msgid "S_ecurity"
-msgstr "Segurtasuna"
-
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME segurua (S/MIME)"
+msgid "Security"
+msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Ezabatu..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Bidalitako mezuak eta zirriborroak"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Zerbitzariaren konfigurazioa"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ezin izan da sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Gorde sinadura"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Sinadura-fitxategia:"
+
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "Jatorrizko kontaktua:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Mota:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
 "dictionary installed."
 msgstr ""
 
-#: 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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15050,205 +15232,122 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr "_Kargatu beti irudiak saretik kanpo"
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Autentifikazio-mota: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Autentifikazio-mota: "
-
-#: mail/mail-config.glade.h:141
-#, fuzzy
-msgid "_Automatically check for new mail every"
-msgstr "_Automatikoki begiratu mezu berririk"
-
-#: mail/mail-config.glade.h:142
-#, fuzzy
-msgid "_Automatically insert smiley images"
-msgstr "_Automatikoki begiratu mezu berririk"
-
-#: mail/mail-config.glade.h:143
-#, fuzzy
-msgid "_Beep when new mail arrives"
-msgstr "Egin bip mezu berriak iristen direnean"
-
-#: mail/mail-config.glade.h:144
-#, fuzzy
-msgid "_Confirm when expunging a folder"
-msgstr "Berretsi karpeta betiko borratzean"
-
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Default signature:"
-msgstr "_HTML sinadura:"
+msgid "_Always load images from the Internet"
+msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:158
 #, fuzzy
-msgid "_Defaults"
-msgstr "Lehenespenak"
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Enable"
 msgstr "Gaitu"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Izen osoa:"
-
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "_HTML Mail"
-msgstr "HTML postan"
-
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "_Identity"
-msgstr "Identitatea"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "ekaina"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
-
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
-msgid "_Play sound file when new mail arrives"
-msgstr "Jo soinua mezu berriak iristean"
+msgid "_Never load images from the Internet"
+msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
-msgid "_Receiving Mail"
-msgstr "Mezuak jaso"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Erantzun denei"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Script:"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Ezabatu..."
-
-#: mail/mail-config.glade.h:173
-#, fuzzy
-msgid "_Sending Mail"
-msgstr "Mezuak bidali"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Erakutsi ordua honela"
 
-#: mail/mail-config.glade.h:175
-#, fuzzy
-msgid "_Signatures"
-msgstr "_Sinadura-fitxategia:"
-
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Standard Font:"
-msgstr "Sand Point"
-
-#: mail/mail-config.glade.h:177
-#, fuzzy
-msgid "_Terminal Font:"
-msgstr "Jatorrizko kontaktua:"
-
 #: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr "Erabili konexio segurua (_SSL)"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minutu"
+
 #: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "color"
+msgstr "kolorea"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15257,7 +15356,7 @@ msgstr ""
 "Errorea '%s' saiatu denean:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15266,7 +15365,7 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Lanean"
 
@@ -15274,132 +15373,131 @@ msgstr "Lanean"
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "\"%s\" bidaltzen"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Huts egin du %d/%d mezuan"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Huts egin du mezua deskodetzean."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s inportatzen %s gisa."
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "%d mezu berreskuratzen"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d mezu berreskuratzen"
+msgstr[1] "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "%d mezu gordetzen"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "%d mezu gordetzen"
+msgstr[1] "%d mezu gordetzen"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15408,7 +15506,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15417,11 +15515,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15430,25 +15528,21 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Maiuskula/minuskula"
@@ -15461,89 +15555,83 @@ msgstr "Bilatu mezuan"
 msgid "Find:"
 msgstr "Bilatu:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Bilatu"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Gehitu irizpidea"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Salbuespenak"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: 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 "Zain..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: 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"
@@ -15553,25 +15641,25 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Gorde sinadura"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 #, fuzzy
 msgid "Edit signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML sinadura:"
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Izena:"
 
@@ -15601,17 +15689,17 @@ msgstr "Birbidalitako mezua"
 msgid "Invalid folder: `%s'"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15624,84 +15712,84 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Handiena"
 
-#: 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 "Gaur %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %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 "%Y %b %d"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -15754,7 +15842,7 @@ msgstr "Jarraitu"
 msgid "For Your Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Birbidali"
 
@@ -15762,11 +15850,11 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
@@ -15793,7 +15881,7 @@ msgstr ""
 
 #: mail/message-tags.glade.h:6
 #, fuzzy
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr "Noizko: "
 
 #: mail/message-tags.glade.h:7
@@ -16024,7 +16112,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Ber_tan behera utzi elementu honentzako bilera"
 
-#: 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 "Hautatu inportatu nahi duzun informazioa:"
 
@@ -16050,26 +16138,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: 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 "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Inportatzen"
 
-#: 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 "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16078,35 +16166,35 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: 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"
@@ -16114,26 +16202,26 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: 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 "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Ez dago hornitzailerik `%s' protokolorako"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Inportatu"
@@ -16142,7 +16230,7 @@ msgstr "Inportatu"
 msgid "Closing connections..."
 msgstr "Konexioak ixten..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution "
@@ -16182,11 +16270,11 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
-#: 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 "
@@ -16195,11 +16283,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Laguntzailea"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ez da karpeta-izenik zehaztu"
@@ -16244,15 +16327,15 @@ msgstr "Ezin izan da Bug Buddy exekutatu."
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution-i buruz"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
@@ -16305,7 +16388,6 @@ msgstr "Chico"
 
 #: 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 "Berria"
 
@@ -16363,16 +16445,17 @@ msgstr "Sortu zeregin berria"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Active Connections"
+msgid "<b>Active Connections</b>"
 msgstr "Konexio aktiboak"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
+#, fuzzy
+msgid "Active Connections"
+msgstr "Konexio aktiboak"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Konexio hauek aktibo daude:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
@@ -16506,28 +16589,28 @@ msgstr ""
 "Laguntzaile honek kanpoko fitxategiak Evolution-era inportatzeko\n"
 "prozesuan zehar gidatuko zaitu."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Inportatzaileak"
 
-#: 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 "Inportatu"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ez inportatu"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ez galdetu berriro"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16560,7 +16643,7 @@ msgstr ""
 "Espero dugu gogokoa izango duzula gure lan gogorraren emaitza,\n"
 "eta atsegin handiz gauzkazu zure ekarpenen zain!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16569,50 +16652,50 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution Taldea\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ez galdetu berriro"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:494
+#: shell/main.c:505
 #, fuzzy
 msgid "Forcibly shut down all evolution components"
 msgstr "Evolution-en ohar-osagairako fabrika."
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: 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"
@@ -16621,48 +16704,59 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\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
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Hautatu karpeta"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Lanean"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Adierazpena"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "_Helbide elektronikoa:"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Idatzi %s(r)en pasahitza"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Idatzi %s(r)en pasahitza"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Idatzi pasahitza"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
@@ -16869,7 +16963,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Txartelaren ID hori badago lehendik"
@@ -17177,7 +17272,7 @@ msgstr "Eraman kontaktua(k) beste karpeta batera..."
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: 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 "Itsatsi arbela"
 
@@ -17186,8 +17281,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Inprimatzeko aurrebista"
 
@@ -17236,13 +17331,13 @@ msgstr "Utzi kargatzeari"
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -17263,14 +17358,10 @@ msgid "_Save as VCard"
 msgstr "_Gorde VCard gisa"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Bilatu kontaktuak"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Hautatu denak"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
@@ -17278,62 +17369,58 @@ msgstr "Bidali _mezua kontaktuari..."
 msgid "Day"
 msgstr "Eguna"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Ezabatu hitzordu hau"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Joan"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Joan atzera"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Joan aurrera"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Joan _data jakin batera"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Joan data jakin batera"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "_Joan gaurko egunera"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Hurrengoa"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Aurrekoa"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
@@ -17342,7 +17429,7 @@ msgstr "Inprimatu egutegi hau"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Argitaratu egutegi honen libre/okupatuta informazioa"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
@@ -17354,35 +17441,55 @@ msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Hautatu izenak"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Joan data jakin batera"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Hautatu karpeta"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Erakutsi xehetasunak"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Erakutsi egun bat"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Erakutsi hilabete bat"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Erakutsi aste bat"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Erakutsi lan-astea"
 
-#: 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 "Gaur"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Ikusi uneko kontaktua"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Astea"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Hitzordua"
@@ -17662,7 +17769,7 @@ msgstr "_Markatu denak irakurritako gisa"
 msgid "Mark all visible messages as read"
 msgstr "Markatu ikusgai dauden mezu guztiak irakurritako gisa"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Itsatsi arbeleko mezua"
@@ -17833,323 +17940,325 @@ msgid "F_orward As..."
 msgstr "Birbidali"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Iragazteko arauak"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Bi_daltzailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Hart_zailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "G_aiaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Jarrait_u..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Kargarazi HTML postako irudiak"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Birbidali hautatutako mezua beste mezu baten testuaren barnean"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Kargatu iru_diak"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Markatu ga_rrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Markatu ez-garran_tzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markatu hautatutako mezua(k) irakurritako gisa"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Markatu hautatutako mezua(k) garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Eraman"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Hurrengoa"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Hurrengo irakurri gabeko mezua"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Ez da aurkitu"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Ireki hautatutako mezua mezu-prestatzailean, berriro bidaltzeko"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Jatorrizko ta_maina"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Zereginaren erantzuna"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Aurrekoa"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Bi_latu mezuan..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "T_xikiagoa"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Erakutsi posta-itur_burua"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburuko guztiekin"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Testu-tamai_na"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "_Bidaltzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "_Hartzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "_Gaiaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Go To"
 msgstr "Joan"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Next Message"
 msgstr "Hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 #, fuzzy
 msgid "_Resend..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Tresnak"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
@@ -18422,43 +18531,43 @@ msgstr "Kopiatu hautatutako zeregina"
 msgid "Cut selected task"
 msgstr "Ebaki hautatutako zeregina"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Ezabatu osatutako zereginak"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Ezabatu hautatutako zereginak"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Markatu 'Osatuta' gisa"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Itsatsi zeregina arbeletik"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Ezabatu hautatutako zereginak"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Zeregina"
@@ -18602,10 +18711,15 @@ msgstr "Egunaren ikuspegia"
 
 #: views/calendar/galview.xml.h:3
 #, fuzzy
+msgid "_List View"
+msgstr "Ikuspegi pertsonalizatua"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
 msgid "_Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 #, fuzzy
 msgid "_Work Week View"
 msgstr "Lan-astearen ikuspegia"
@@ -18642,11 +18756,16 @@ msgstr "Mezuak"
 
 #: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With _Category"
-msgstr "Kategoria hau dutenak"
+msgid "With _Due Date"
+msgstr "_Mugaeguna:"
 
 #: views/tasks/galview.xml.h:2
 #, fuzzy
+msgid "With _Status"
+msgstr "Ezarri egoera"
+
+#: views/tasks/galview.xml.h:3
+#, fuzzy
 msgid "_Tasks"
 msgstr "_Zeregina"
 
@@ -18709,14 +18828,10 @@ msgstr "AAAOOLI"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: 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 "Orain"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Gaur"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18726,82 +18841,87 @@ msgstr "Ordua formatu honetan idatzi behar da: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ehunekoaren balioak 0 and 100 bitartekoa izan behar du (biak barne)."
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltikoa"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Europako Erdialdekoa"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Txinatarra"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Zirilikoa"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Grekoa"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebrearra"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japoniarra"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Korearra"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turkiarra"
 
-#: 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 "Europako Mendebaldekoa"
 
-#: 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 "Europako Mendebaldekoa"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradizionala"
 
-#: 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 "Sinplifikatua"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrainarra"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Bisuala"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Karaktere-joko ezezaguna: %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 "Karaktere-kodeketa"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Adierazi erabili behar den karaktere-jokoa"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Besterik..."
 
@@ -18869,11 +18989,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Bilatu"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Bilaketa-editorea"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
@@ -18897,16 +19022,16 @@ msgstr "Aurreratua..."
 msgid "Choose Image"
 msgstr "Aukeratu ekintza bat:"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 #, fuzzy
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: 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
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
@@ -18939,6 +19064,369 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "_Helbide-liburuaren iturburuak..."
+
+#, fuzzy
+#~ msgid "Selected:"
+#~ msgstr "Ezabatuta"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Kontaktu berria"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "eta beste %d txartel."
+
+#, fuzzy
+#~ msgid "Send an Email"
+#~ msgstr "Bidali mezua"
+
+#~ msgid "1 day"
+#~ msgstr "egun bat"
+
+#~ msgid "1 week"
+#~ msgstr "aste bat"
+
+#~ msgid "1 hour"
+#~ msgstr "ordubete"
+
+#~ msgid "1 minute"
+#~ msgstr "minutu bat"
+
+#~ msgid "1 second"
+#~ msgstr "segundo bat"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Azalpena:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Hitzordua"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmak"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Kokaleku geografikoa"
+
+#~ msgid "URL"
+#~ msgstr "URLa"
+
+#, fuzzy
+#~ msgid "Every %d days"
+#~ msgstr "%d egun"
+
+#, fuzzy
+#~ msgid "Every %d weeks"
+#~ msgstr "%d aste"
+
+#, fuzzy
+#~ msgid "Every %d weeks on "
+#~ msgstr "%d aste"
+
+#~ msgid "Go To Date"
+#~ msgstr "Joan data jakin batera"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Joan gaurko egunera"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Zerbitzari-izena"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "Bilaketa-_oinarria:"
+
+#, fuzzy
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "AUTH eskaera denboraz kanpo: %s"
+
+#, fuzzy
+#~ msgid "STARTTLS response error"
+#~ msgstr "DATA erantzunaren errorea"
+
+#, fuzzy
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "RSET eskaera denboraz kanpo: %s"
+
+#, fuzzy
+#~ msgid "HELO response error"
+#~ msgstr "RSET erantzunaren errorea"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH eskaera denboraz kanpo: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH eskaerak huts egin du."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM erantzunaren errorea"
+
+#~ msgid "RCPT TO request timed out: %s: mail not sent"
+#~ msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
+
+#~ msgid "DATA request timed out: %s: mail not sent"
+#~ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
+
+#~ msgid "DATA response error"
+#~ msgstr "DATA erantzunaren errorea"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "DATA bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA amaitze-erantzunaren errorea"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "RSET eskaera denboraz kanpo: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "RSET erantzunaren errorea"
+
+#, fuzzy
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "AUTH eskaera denboraz kanpo: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "QUIT erantzunaren errorea"
+
+#, fuzzy
+#~ msgid "%d seconds ago"
+#~ msgstr "%d segundo"
+
+#, fuzzy
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minutu"
+
+#, fuzzy
+#~ msgid "%d hours ago"
+#~ msgstr "%d ordu"
+
+#, fuzzy
+#~ msgid "%d days ago"
+#~ msgstr "lehenago"
+
+#, fuzzy
+#~ msgid "%d weeks ago"
+#~ msgstr "%d aste"
+
+#, fuzzy
+#~ msgid "%d months ago"
+#~ msgstr "lehenago"
+
+#, fuzzy
+#~ msgid "%d years ago"
+#~ msgstr "lehenago"
+
+#~ msgid "Then"
+#~ msgstr "Orduan"
+
+#~ msgid "If"
+#~ msgstr "Baldin eta"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Editatu iragazkiak"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Editatu karpeta birtualak"
+
+#~ msgid "Outgoing"
+#~ msgstr "Irteerakoa"
+
+#, fuzzy
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Exekutatu shell komandoa"
+
+#, fuzzy
+#~ msgid "Shell Command"
+#~ msgstr "Exekutatu shell komandoa"
+
+#~ msgid "Rules"
+#~ msgstr "Arauak"
+
+#, fuzzy
+#~ msgid "[script]"
+#~ msgstr "Azalpenik ez"
+
+#, fuzzy
+#~ msgid "Add script signature"
+#~ msgstr "Gehitu irizpidea"
+
+#~ msgid "Current store format:"
+#~ msgstr "Biltegiaren uneko formatua:"
+
+#, fuzzy
+#~ msgid "Index body contents"
+#~ msgstr "Gorputzaren edukia"
+
+#~ msgid "New store format:"
+#~ msgstr "Biltegiaren formatu berria:"
+
+#~ 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 ""
+#~ "Oharra: Postontzi-formatu batetik bestera bihurtzerakoan gerta\n"
+#~ "daitezkeen hutsegiteak (adibidez, diskoa betetzea) beharbada\n"
+#~ "ezingo dira automatikoki berreskuratu.  Kontuz ibili, beraz."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontuaren informazioa"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentifikazioa"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Mezuak prestatzen"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigurazioa"
+
+#, fuzzy
+#~ msgid "Default Behavior"
+#~ msgstr "Lehentasun lehenetsia:"
+
+#, fuzzy
+#~ msgid "Deleting Mail"
+#~ msgstr "Mezuak bilatzen"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "Aukerak"
+
+#, fuzzy
+#~ msgid "Labels and Colors"
+#~ msgstr "Gorde eta itxi"
+
+#, fuzzy
+#~ msgid "Loading Images"
+#~ msgstr "Kargatu iru_diak"
+
+#, fuzzy
+#~ msgid "Message Display"
+#~ msgstr "_Mezu-bistaratzea"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "mezuak hau dauka"
+
+#~ msgid "Optional Information"
+#~ msgstr "Aukerako informazioa"
+
+#, fuzzy
+#~ msgid "Printed Fonts"
+#~ msgstr "Inprimatu hautatutako kontaktuak"
+
+#~ msgid "Re_member this password"
+#~ msgstr "_Gogoratu pasahitz hau"
+
+#, fuzzy
+#~ msgid "Remember this _password"
+#~ msgstr "Gogoratu pasahitz hau"
+
+#~ msgid "Required Information"
+#~ msgstr "Beharrezko informazioa"
+
+#, fuzzy
+#~ msgid "Restore Defaults"
+#~ msgstr "Lehenespenak"
+
+#, fuzzy
+#~ msgid "S_ecurity"
+#~ msgstr "Segurtasuna"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME segurua (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Zerbitzariaren konfigurazioa"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Autentifikazio-mota: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Autentifikazio-mota: "
+
+#, fuzzy
+#~ msgid "_Default signature:"
+#~ msgstr "_HTML sinadura:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Izen osoa:"
+
+#, fuzzy
+#~ msgid "_Identity"
+#~ msgstr "Identitatea"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "ekaina"
+
+#, fuzzy
+#~ msgid "_Receiving Mail"
+#~ msgstr "Mezuak jaso"
+
+#, fuzzy
+#~ msgid "_Sending Mail"
+#~ msgstr "Mezuak bidali"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "\"%s\" bidaltzen"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Huts egin du %d/%d mezuan"
+
+#~ msgid "Search"
+#~ msgstr "Bilatu"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Gehitu irizpidea"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Salbuespenak"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Laguntzailea"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Konexio hauek aktibo daude:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Bilatu kontaktuak"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Joan _data jakin batera"
+
+#~ msgid "Go to today"
+#~ msgstr "_Joan gaurko egunera"
+
+#, fuzzy
+#~ msgid "With _Category"
+#~ msgstr "Kategoria hau dutenak"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Helbide-liburuaren iturburuak"
 
@@ -19283,9 +19771,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "LDAP zerbitzaria"
 
-#~ msgid "Select Names"
-#~ msgstr "Hautatu izenak"
-
 #, fuzzy
 #~ msgid "Selected Contacts:"
 #~ msgstr "Kontaktua ezabatu?"
@@ -19316,10 +19801,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgstr "Egutegi-informazioa"
 
 #, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Bistaratuko den mezua"
-
-#, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "Egoera:"
 
@@ -19336,10 +19817,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgstr "Egutegi-informazioa"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "Eginda "
-
-#, fuzzy
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "Lan-astea"
 
@@ -19376,10 +19853,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgstr "Ezin izan da %s direktorioa sortu: %s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Aurrebista"
-
-#, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "Lanean"
 
@@ -19682,9 +20155,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "New _Task"
 #~ msgstr "_Zeregin berria"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "Evolution _leihoa"
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Evolution _leihoa"
@@ -20099,9 +20569,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "No cards"
 #~ msgstr "Txartelik ez"
 
-#~ msgid "1 card"
-#~ msgstr "txartel bat"
-
 #~ msgid "%d cards"
 #~ msgstr "%d txartel"
 
@@ -20171,9 +20638,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_Save as..."
 #~ msgstr "Gorde honela..."
 
-#~ msgid "End Date"
-#~ msgstr "Amaiera-eguna"
-
 #~ msgid "Print..."
 #~ msgstr "Inprimatu..."
 
@@ -20212,9 +20676,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Failed to find a common bulk algorithm."
 #~ msgstr "Huts egin du handizkako algoritmo arrunta aurkitzean."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "Huts egin du mezua deskodetzean."
-
 #, fuzzy
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
@@ -20461,9 +20922,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "However, the message was successfully sent."
 #~ msgstr "Hala ere, mezua ongi bidali da."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Mezu izengabea)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Mezu hutsa"
 
@@ -28720,12 +29178,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "News Feeds"
 #~ msgstr "Be_rri-iturriak"
 
-#~ msgid "One mont_h"
-#~ msgstr "Hi_labete"
-
-#~ msgid "One w_eek"
-#~ msgstr "_Astebete"
-
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "Freskatze-_denbora (segundotan):"
 
@@ -28745,9 +29197,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Tenperatura-eskala:"
 
-#~ msgid "Tasks "
-#~ msgstr "Zereginak "
-
 #, fuzzy
 #~ msgid "Weather Settings"
 #~ msgstr "Eguraldiaren ezarpenak"
@@ -28770,9 +29219,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_New Feed"
 #~ msgstr "Be_rri-iturriak"
 
-#~ msgid "_One day"
-#~ msgstr "E_gun bat"
-
 #, fuzzy
 #~ msgid "_Show full path for folders"
 #~ msgstr "_Erakutsi karpeten bide-izen osoa"
@@ -29889,18 +30335,10 @@ msgstr "%s (%%%d osatuta)"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature script"
-#~ msgstr "Ezabatu dena sinadura izan ezik"
-
-#, fuzzy
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML sinadura:"
 
 #, fuzzy
-#~ msgid "_Language:"
-#~ msgstr "Hizkuntza"
-
-#, fuzzy
 #~ msgid "_Random"
 #~ msgstr "Irrati-telefonoa"
 
@@ -30023,9 +30461,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Ezin izan da 'Nork' helbidea aurkitu mezuan"
 
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da zehaztu."
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Evolution-en laneko laburpena egiteko osagaia."
 
@@ -30545,12 +30980,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ezezaguna)"
 
-#~ msgid "RCPT TO response error: %s: mail not sent"
-#~ msgstr "RCPT TO erantzunaren errorea: %s: posta ez da bidali"
-
-#~ msgid "DATA response error: %s: mail not sent"
-#~ msgstr "DATA erantzunaren errorea: %s: posta ez da bidali"
-
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr "DATA erantzunaren errorea: mezuaren amaiera: %s: posta ez da bidali"
 
diff --git a/po/fa.po b/po/fa.po
index f7a51dfa16..5ac089c04c 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-01-11 20:23+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -16,6 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+msgid "evolution addressbook"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:101
+msgid "current addressbook folder "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "کارت‌ها"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "۱ کارت"
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -93,76 +129,92 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "نشانی"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "نشانی"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "نشانی"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "ایجاد پنجره‌ی جدید"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -187,17 +239,17 @@ msgstr ""
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "شخصی"
 
@@ -242,53 +294,53 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr ""
 
@@ -311,16 +363,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -335,61 +381,52 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "Address Book Creation Assistant"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "نشانی"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "نشانی"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "همیشه"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -397,50 +434,50 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "عمومی"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "هرگز"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -450,30 +487,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "یک"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -484,7 +517,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -493,7 +526,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -501,39 +534,39 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -542,7 +575,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -550,7 +583,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -560,7 +593,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -570,41 +603,41 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -612,28 +645,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "ا_ستفاده از SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "استفاده از نشانی پست الکترونیکی"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -641,60 +674,48 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_ویرایش"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "شماره‌ی _درگاه:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "کارت‌ها"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr ""
 
@@ -726,7 +747,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr ""
 
@@ -742,7 +763,7 @@ msgstr "نام"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "منبع"
 
@@ -809,7 +830,8 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr ""
 
@@ -818,7 +840,7 @@ msgid "D_epartment:"
 msgstr "_بخش:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "جزئیات"
@@ -898,16 +920,27 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_حذف شود"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_ویرایش"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr ""
@@ -949,22 +982,22 @@ msgid "_Web page address:"
 msgstr "نشانی صفحه‌ی _وب:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "نشانی"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr ""
 
@@ -1945,9 +1978,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr ""
 
@@ -1961,21 +1994,22 @@ msgid "MSN Messenger"
 msgstr "پیغام _بعدی"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "منبع"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr ""
 
@@ -1985,107 +2019,95 @@ msgid "Username"
 msgstr "تغییر نام"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "منزل"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "کاری"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "کتاب منبع"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "کتاب مقصد"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "نام حساب"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "کاری"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2099,6 +2121,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "نام _کامل:"
 
@@ -2106,6 +2129,18 @@ msgstr "نام _کامل:"
 msgid "E-_mail:"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "نشانی _۲:"
@@ -2208,23 +2243,27 @@ msgid "_Title:"
 msgstr "_عنوان:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-#, fuzzy
-msgid "Account name:"
-msgstr "نام حساب"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr ""
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "نام حساب"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "منبع"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
-msgstr ""
+#, fuzzy
+msgid "_Location:"
+msgstr "_خانوادگی"
+
+#: 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"
@@ -2246,25 +2285,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "کتاب"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2312,23 +2352,21 @@ msgid "No contacts"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, c-format
-msgid "%d contacts"
-msgstr ""
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr ""
 
@@ -2340,133 +2378,132 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "پیش‌رفته..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2475,7 +2512,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
@@ -2509,8 +2546,6 @@ msgid "Car Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
@@ -2519,7 +2554,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr ""
 
@@ -2570,6 +2605,7 @@ msgid "Manager"
 msgstr "مدیر"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr ""
 
@@ -2578,7 +2614,7 @@ msgid "Nickname"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr ""
 
@@ -2587,7 +2623,7 @@ msgid "Office"
 msgstr "دفتر"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "سازمان"
 
@@ -2643,17 +2679,17 @@ msgid "Web Site"
 msgstr "وبگاه"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr ""
 
@@ -2697,84 +2733,87 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "اعضای فهرست"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "کاری"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 msgid "Position"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "Groupwise"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "شخصی"
+msgid "work"
+msgstr "کاری"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "شخصی"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "عنوان شغل"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "صفحه‌ی آغازه"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "موفقیت"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2782,149 +2821,149 @@ msgstr "موفقیت"
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "لغو شد"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "فهرست"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2961,33 +3000,31 @@ msgstr ""
 msgid "Querying Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
-msgid "and %d other contacts."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
 msgid "and one other contact."
-msgstr ""
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr ""
 
@@ -3135,7 +3172,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr ""
 
@@ -3312,7 +3349,7 @@ msgid "Unnamed List"
 msgstr ""
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3389,7 +3426,7 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: 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"
@@ -3435,24 +3472,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3461,12 +3498,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3474,7 +3511,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3485,7 +3522,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3649,13 +3686,13 @@ msgstr ""
 msgid "Location contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr ""
 
@@ -3671,7 +3708,7 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr ""
 
@@ -3682,7 +3719,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
 
@@ -3704,70 +3741,70 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_تقویم"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3797,10 +3834,6 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3818,16 +3851,16 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -3891,11 +3924,11 @@ msgstr ""
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr ""
 
@@ -3918,11 +3951,11 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr ""
 
@@ -3931,17 +3964,17 @@ msgstr ""
 msgid "Reminders"
 msgstr "اعضا"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr ""
@@ -3972,7 +4005,7 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr ""
 
@@ -3982,8 +4015,8 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr ""
 
@@ -3998,19 +4031,19 @@ msgstr "حذف"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr ""
 
@@ -4034,7 +4067,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Alerts"
 msgstr ""
 
@@ -4059,7 +4092,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
@@ -4156,7 +4189,7 @@ msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "هفته‌ی کاری"
 
@@ -4202,7 +4235,6 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr ""
 
@@ -4291,7 +4323,7 @@ msgid ""
 msgstr ""
 
 #: 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 ""
 
@@ -4430,28 +4462,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr ""
 
@@ -4487,8 +4519,9 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr ""
 
@@ -4502,33 +4535,18 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "تقویم:"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "تاجیکستان"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4558,18 +4576,24 @@ msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
 #, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
 #, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4631,7 +4655,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
@@ -4703,8 +4727,6 @@ msgstr "تقویم:"
 
 #: 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 ""
 
@@ -4755,13 +4777,13 @@ msgstr ""
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr ""
 
@@ -4818,13 +4840,13 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
@@ -4996,7 +5018,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr ""
 
@@ -5035,7 +5057,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5043,6 +5065,28 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "انتخاب نام‌ها"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr ""
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "تقویم:"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "تاجیکستان"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
@@ -5072,39 +5116,39 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
@@ -5119,7 +5163,8 @@ msgid "Undefined"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "_تاریخ تکمیل:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5163,9 +5208,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr ""
 
@@ -5174,12 +5219,14 @@ msgid "Folder:"
 msgstr "پوشه:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr ""
+#, fuzzy
+msgid "Sta_rt date:"
+msgstr "تاریخ آغاز:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr ""
+#, fuzzy
+msgid "_Due date:"
+msgstr "نشانی صفحه‌ی _وب:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "Authentication Credentials for HTTP Server"
@@ -5234,135 +5281,111 @@ msgstr "هفته"
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
-msgid "%d days"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:403
+#: calendar/gui/e-alarm-list.c:400
 #, c-format
-msgid "%d weeks"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:411
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
-msgid "%d hours"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr ""
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:419
+#: calendar/gui/e-alarm-list.c:410
 #, c-format
-msgid "%d minutes"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr ""
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:427
+#: calendar/gui/e-alarm-list.c:415
 #, c-format
-msgid "%d seconds"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr ""
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr ""
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr ""
@@ -5395,250 +5418,262 @@ msgid ""
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr ""
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
+#: calendar/gui/e-calendar-table.c:413
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
+#: calendar/gui/e-calendar-table.c:414
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
+#: calendar/gui/e-calendar-table.c:415
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
+#: calendar/gui/e-calendar-table.c:416
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
+#: calendar/gui/e-calendar-table.c:417
+msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
+#: calendar/gui/e-calendar-table.c:418
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
+#: calendar/gui/e-calendar-table.c:419
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
+#: calendar/gui/e-calendar-table.c:420
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
+#: calendar/gui/e-calendar-table.c:421
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
+#: calendar/gui/e-calendar-table.c:422
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
+#: calendar/gui/e-calendar-table.c:423
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
+#: calendar/gui/e-calendar-table.c:1041
+msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
-msgid "0%"
+#: calendar/gui/e-calendar-table.c:1053
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
-msgid "10%"
+#: calendar/gui/e-calendar-table.c:1054
+msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
-msgid "20%"
+#: calendar/gui/e-calendar-table.c:1055
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
-msgid "30%"
+#: calendar/gui/e-calendar-table.c:1056
+msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
-msgid "40%"
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:418
-msgid "50%"
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Click to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:419
-msgid "60%"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:420
-msgid "70%"
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:421
-msgid "80%"
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Completion date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:422
-msgid "90%"
+#: calendar/gui/e-calendar-table.etspec.h:6
+msgid "Due date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:423
-msgid "100%"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
-msgid "Open _Web Page"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "تاریخ آغاز:"
 
-#: calendar/gui/e-calendar-table.c:1050
-msgid "_Assign Task"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1051
-msgid "_Forward as iCalendar"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1052
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1053
-msgid "_Mark Selected Tasks as Complete"
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
-msgid "_Delete Selected Tasks"
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
-msgid "Click to add a task"
-msgstr ""
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "انتخاب _همه"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr ""
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_حذف شود..."
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
-msgid "Complete"
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "_تقویم"
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "تقویم جدید"
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Priority"
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
@@ -5668,26 +5703,26 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr ""
@@ -5696,415 +5731,411 @@ msgstr ""
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, c-format
 msgid "Every day"
-msgstr ""
+msgid_plural "Every %d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, c-format
-msgid "Every %d days"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:611
 msgid "Every week"
-msgstr ""
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, c-format
-msgid "Every %d weeks"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr ""
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, c-format
 msgid "every month"
-msgstr ""
+msgid_plural "every %d months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:648
 #, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
 msgid "Every year"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr ""
+
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6239,7 +6270,7 @@ msgstr ""
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr ""
 
@@ -6321,12 +6352,12 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6334,7 +6365,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6342,58 +6373,60 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1751
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
-msgid "Loading tasks at %s"
+msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
-msgid "Loading appointments at %s"
+msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr ""
 
@@ -6414,44 +6447,46 @@ msgid "February"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
-msgstr ""
+#, fuzzy
+msgid "Select Date"
+msgstr "انتخاب نام‌ها"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr ""
+#, fuzzy
+msgid "_Select Today"
+msgstr "انتخاب نام‌ها"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6533,7 +6568,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -6690,81 +6725,81 @@ msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr ""
 
@@ -6773,36 +6808,36 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8439,7 +8474,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8447,7 +8482,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8455,7 +8490,7 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr ""
 
@@ -8472,7 +8507,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -8583,30 +8618,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr ""
 
-#: 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 ""
 
@@ -8635,7 +8674,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 ""
 
@@ -8987,7 +9027,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9175,7 +9215,7 @@ msgstr ""
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
@@ -9184,21 +9224,22 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists"
 msgstr ""
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9405,17 +9446,17 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9447,39 +9488,39 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "نشانی"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
+msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "تاریخ آغاز:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 #, fuzzy
 msgid "Checklist"
 msgstr "فهرست"
@@ -9487,12 +9528,12 @@ msgstr "فهرست"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9548,12 +9589,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: 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 ""
 
-#: 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
@@ -9567,25 +9608,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9656,18 +9697,18 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9677,14 +9718,14 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -9692,49 +9733,49 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9742,32 +9783,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1786
-#: camel/providers/local/camel-maildir-store.c:137
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
 #, c-format
-msgid "Cannot create folder `%s': folder exists."
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2046
+#: 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
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9798,20 +9840,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. 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 ""
@@ -9867,7 +9909,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"
@@ -9916,8 +9958,8 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
@@ -9947,14 +9989,14 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
@@ -9973,7 +10015,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -9982,28 +10024,28 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10049,7 +10091,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10077,30 +10119,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 
-#: 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 ""
@@ -10144,7 +10186,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -10187,12 +10229,12 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr ""
@@ -10456,46 +10498,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
 #, c-format
 msgid "No such folder: %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10542,7 +10584,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr ""
 
@@ -10622,7 +10664,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr ""
 
@@ -10674,12 +10716,12 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -10798,11 +10840,11 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
-msgid "STARTTLS request timed out: %s"
+msgid "STARTTLS command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
+msgid "STARTTLS command failed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
@@ -10834,153 +10876,150 @@ msgid "SMTP mail delivery via %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "Cannot send message: service not connected."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, c-format
-msgid "HELO request timed out: %s"
+msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 #, c-format
-msgid "AUTH request timed out: %s"
+msgid "AUTH command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
+msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
 #, c-format
-msgid "DATA request timed out: %s: mail not sent"
+msgid "DATA command failed: %s: mail not sent"
 msgstr ""
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
 #, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
+msgid "RSET command failed: %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
+msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, c-format
-msgid "QUIT request timed out: %s"
+msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -11002,19 +11041,19 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr ""
 
@@ -11025,45 +11064,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11072,11 +11111,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr ""
 
@@ -11084,82 +11123,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11168,48 +11207,53 @@ msgid ""
 msgstr ""
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "ایالات متحده"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11217,13 +11261,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11337,21 +11381,21 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr ""
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -11434,13 +11478,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr ""
 
@@ -11449,118 +11493,104 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, c-format
 msgid "1 second ago"
-msgstr ""
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, c-format
-msgid "%d seconds ago"
-msgstr ""
-
-#: filter/filter-datespec.c:66
 msgid "1 minute ago"
-msgstr ""
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, c-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: filter/filter-datespec.c:67
 msgid "1 hour ago"
-msgstr ""
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, c-format
-msgid "%d hours ago"
-msgstr ""
-
-#: filter/filter-datespec.c:68
 msgid "1 day ago"
-msgstr ""
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, c-format
-msgid "%d days ago"
-msgstr ""
-
-#: filter/filter-datespec.c:69
 msgid "1 week ago"
-msgstr ""
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, c-format
-msgid "%d weeks ago"
-msgstr ""
-
-#: filter/filter-datespec.c:70
 msgid "1 month ago"
-msgstr ""
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
 #, c-format
-msgid "%d months ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr ""
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr ""
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr ""
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+msgid "_Filter Rules"
 msgstr ""
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
+msgid "<b>Then</b>"
 msgstr ""
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr ""
 
@@ -11572,23 +11602,23 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr ""
 
@@ -11596,48 +11626,53 @@ msgstr ""
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
+msgstr "_نام پرونده:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:772
-msgid "If"
+#: filter/filter-rule.c:779
+msgid "<b>If</b>"
 msgstr ""
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
+msgid "    "
 msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
+msgid "<b>_Filter Rules</b>"
 msgstr ""
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
+msgid "<b>vFolder Sources</b>"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:5
@@ -11645,80 +11680,68 @@ msgid "Incoming"
 msgstr ""
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr ""
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr ""
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr ""
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr ""
 
@@ -11851,7 +11874,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -11882,7 +11905,7 @@ msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
+msgid "Pipe to Program"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
@@ -11917,21 +11940,21 @@ msgstr ""
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:53
+msgid "Run Program"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "Sender"
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "Set Status"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Shell Command"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
@@ -11958,9 +11981,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
@@ -11969,17 +11992,13 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr ""
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
@@ -11991,8 +12010,8 @@ msgstr ""
 msgid "Rule name"
 msgstr ""
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+msgid "_Score Rules"
 msgstr ""
 
 #: filter/searchtypes.xml.h:1
@@ -12027,15 +12046,20 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "_پوشه"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr ""
 
@@ -12084,8 +12108,8 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr ""
@@ -12094,53 +12118,49 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr ""
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr ""
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
+#: mail/em-composer-prefs.c:1000
+msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr ""
 
@@ -12185,7 +12205,7 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12216,389 +12236,418 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, c-format
+msgid "Moving folder %s"
+msgstr ""
+
+#: mail/em-folder-tree.c:879
+#, c-format
+msgid "Copying folder %s"
+msgstr ""
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "_پیغام‌ها"
+
+#: mail/em-folder-tree.c:888
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr ""
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, c-format
+msgid "Creating folder `%s'"
+msgstr ""
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr ""
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr ""
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr ""
 
@@ -12607,123 +12656,155 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr ""
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+msgid "Every time"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+msgid "Once per week"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:88
+msgid "Once per month"
+msgstr ""
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12732,22 +12813,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr ""
@@ -12786,99 +12867,99 @@ msgstr ""
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr ""
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "اضافه کردن نشانی"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "_پیغام‌ها"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12887,7 +12968,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -12952,255 +13033,287 @@ msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Default reply style"
+msgid "Default height of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Default width of the Composer Window"
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Message Window"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
-msgid "Enable/disable caret mode"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:23
-msgid "Height of the message-list pane"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:24
-msgid "Height of the message-list pane."
+msgid "Enable/disable caret mode"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13208,109 +13321,109 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr ""
 
@@ -13349,14 +13462,14 @@ msgstr ""
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13399,12 +13512,12 @@ msgstr ""
 msgid "Scanning %s"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:650
+#: mail/importers/netscape-importer.c:651
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13419,7 +13532,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13427,7 +13540,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13436,23 +13549,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13480,59 +13593,28 @@ msgstr ""
 msgid "Pine"
 msgstr ""
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr ""
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -13565,11 +13647,11 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13577,80 +13659,81 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_پوشه"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13659,617 +13742,634 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
 msgstr ""
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "قبلی"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
+msgid "<b>S_ignatures</b>"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "<b>_Languages</b>"
 msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
+msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
+msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:20
-msgid "Attach original message"
+msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:22
-msgid "Authentication"
+msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
+msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
+msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:26
-msgid "C_olors"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:27
-msgid "Check _Incoming Mail"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:28
-msgid "Check spelling while I _type"
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:30
-msgid "Checks incoming mail messages to be Junk"
+msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:31
-msgid "Color for _misspelled words:"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:32
-msgid "Composing Messages"
+msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Configuration"
+msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:34
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
+msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "De_fault"
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:42
-msgid "Default Behavior"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 #: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+msgid "Attachment"
 msgstr ""
 
 #: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
+msgid "Automatically _insert smiley images"
 msgstr ""
 
 #: mail/mail-config.glade.h:47
-msgid "Do not quote original message"
+msgid "Automatically check for _new mail every"
 msgstr ""
 
 #: mail/mail-config.glade.h:48
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Done"
+#: mail/mail-config.glade.h:49
+msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
 #: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "C_haracter set:"
 msgstr ""
 
 #: mail/mail-config.glade.h:52
-msgid "Email Accounts"
+msgid "Ch_eck for Supported Types "
 msgstr ""
 
 #: mail/mail-config.glade.h:53
-msgid "Email _address:"
+msgid "Check _Incoming Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+msgid "Check spelling while I _type"
 msgstr ""
 
 #: mail/mail-config.glade.h:55
-msgid "Encry_ption certificate:"
+msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Evolution Account Assistant"
+msgid "Color for _misspelled words:"
 msgstr ""
 
 #: mail/mail-config.glade.h:57
-msgid "Execute Command..."
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "کومورو"
 
 #: mail/mail-config.glade.h:58
-msgid "Fi_xed -width:"
+msgid "Confirm _when expunging a folder"
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
-msgid "Font Properties"
-msgstr ""
-
-#: mail/mail-config.glade.h:61
-msgid "Format messages in _HTML"
-msgstr ""
-
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Highlight _quotations with"
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:64
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:65
+msgid "De_fault"
 msgstr ""
 
 #: mail/mail-config.glade.h:67
-msgid "Inline"
+msgid "Default character e_ncoding:"
 msgstr ""
 
 #: mail/mail-config.glade.h:68
-msgid "Kerberos "
-msgstr ""
+#, fuzzy
+msgid "Defaults"
+msgstr "جزئیات"
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
+#: mail/mail-config.glade.h:70
+msgid "Do not quote original message"
 msgstr ""
 
 #: mail/mail-config.glade.h:71
-msgid "Loading Images"
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Mail Configuration"
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
-msgid "Mailbox location"
-msgstr ""
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "_پوشه:"
 
 #: mail/mail-config.glade.h:75
-msgid "Message Composer"
+msgid "Email Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr ""
+#, fuzzy
+msgid "Email _Address:"
+msgstr "نشانی پست الکترونیکی:"
 
 #: mail/mail-config.glade.h:77
-msgid "Message Fonts"
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
 msgstr ""
 
 #: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Fi_xed -width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
-msgid "Optional Information"
+msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
-msgid "Or_ganization:"
+#: mail/mail-config.glade.h:83
+msgid "Format messages in _HTML"
 msgstr ""
 
 #: mail/mail-config.glade.h:85
-msgid "PGP/GPG _Key ID:"
+msgid "HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
-msgid "Pick a color"
-msgstr ""
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
+msgstr "اعضا"
 
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:87
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
+#: mail/mail-config.glade.h:88
+msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
+#: mail/mail-config.glade.h:91
+msgid "Inline"
 msgstr ""
 
 #: mail/mail-config.glade.h:93
-msgid "Qmail maildir "
-msgstr ""
-
-#: mail/mail-config.glade.h:94
-msgid "Quote original message"
+msgid "Kerberos "
 msgstr ""
 
 #: mail/mail-config.glade.h:95
-msgid "Quoted"
-msgstr ""
-
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
+msgid "Mail Configuration"
 msgstr ""
 
 #: mail/mail-config.glade.h:97
-msgid "Re_ply-To:"
+msgid "Mailbox location"
 msgstr ""
 
 #: mail/mail-config.glade.h:98
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
+msgid "Message Composer"
 msgstr ""
 
 #: mail/mail-config.glade.h:101
-msgid "Required Information"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
 #: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
+msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "Select HTML fixed width font"
+#: mail/mail-config.glade.h:103
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
 #: mail/mail-config.glade.h:107
-msgid "Select HTML fixed width font for printing"
+msgid "Pick a color"
 msgstr ""
 
 #: mail/mail-config.glade.h:108
-msgid "Select HTML variable width font"
+msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
 #: mail/mail-config.glade.h:109
-msgid "Select HTML variable width font for printing"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
 #: mail/mail-config.glade.h:110
-msgid "Sending Email"
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+msgid "Quote original message"
 msgstr ""
 
 #: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
+msgid "Re_member password"
 msgstr ""
 
 #: mail/mail-config.glade.h:114
-msgid "Ser_ver requires authentication"
+msgid "Re_ply-To:"
 msgstr ""
 
 #: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:116
-msgid "Server _Type: "
+msgid "Receiving Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:117
-msgid "Si_gning certificate:"
+msgid "Receiving Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:118
-msgid "Specify _filename:"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+msgid "Remember _password"
 msgstr ""
 
 #: mail/mail-config.glade.h:120
-msgid "Standard Unix mbox"
+msgid "S_tandard Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:121
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:122
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:123
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
 #: mail/mail-config.glade.h:124
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+#: mail/mail-config.glade.h:125
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
-msgid "Use _Daemon"
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_حذف شود..."
+
+#: mail/mail-config.glade.h:127
+msgid "Sending Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:130
-msgid "V_ariable-width:"
+msgid "Sent _Messages Folder:"
 msgstr ""
 
 #: mail/mail-config.glade.h:131
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
+msgid "Ser_ver requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:132
+msgid "Server _Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:133
+msgid "Si_gning certificate:"
 msgstr ""
 
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "سنگاپور"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "سنگاپور"
+
 #: mail/mail-config.glade.h:136
-msgid "_Add Signature"
+msgid "Specify _filename:"
 msgstr ""
 
 #: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
+msgid "Spell Checking"
 msgstr ""
 
 #: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
+msgid "T_erminal Font:"
 msgstr ""
 
 #: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
+msgid "T_ype: "
 msgstr ""
 
 #: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr ""
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
 #: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
 #: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:147
-msgid "_Do not notify me when new mail arrives"
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:149
-msgid "_Enable"
+#: mail/mail-config.glade.h:148
+msgid "Use _Daemon"
 msgstr ""
 
 #: mail/mail-config.glade.h:150
-msgid "_Encrypt outgoing messages (by default)"
+msgid "V_ariable-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:151
-msgid "_Forward style:"
-msgstr ""
-
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:156
-msgid "_Identity"
+msgid "_Add Signature"
 msgstr ""
 
 #: mail/mail-config.glade.h:157
-msgid "_Junk"
+msgid "_Always load images from the Internet"
 msgstr ""
 
 #: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in address book"
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
 #: mail/mail-config.glade.h:159
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:160
-msgid "_Make this my default account"
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
 #: mail/mail-config.glade.h:161
-msgid "_Mark messages as read after"
+msgid "_Enable"
 msgstr ""
 
 #: mail/mail-config.glade.h:162
-msgid "_Name:"
+msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
 #: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
+msgid "_Forward style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Load images if sender is in address book"
 msgstr ""
 
 #: mail/mail-config.glade.h:167
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Local Tests Only"
 msgstr ""
 
 #: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
+msgid "_Make this my default account"
 msgstr ""
 
 #: mail/mail-config.glade.h:169
-msgid "_Reply style:"
+msgid "_Mark messages as read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
+msgid "_Name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:171
-msgid "_Script:"
-msgstr ""
-
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
+msgid "_Never load images from the Internet"
 msgstr ""
 
 #: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Show animated images"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
-msgid "_Signatures"
+msgid "_Reply style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
+msgid "_Script:"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
+msgid "_Show animated images"
 msgstr ""
 
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+msgid "_minute(s)"
+msgstr ""
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr ""
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -14277,175 +14377,170 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:741
+#: mail/mail-ops.c:695
 #, c-format
-msgid "Failed on message %d of %d"
+msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1838
 #, c-format
-msgid "Retrieving %d message(s)"
-msgstr ""
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-ops.c:1963
+#: mail/mail-ops.c:1924
 #, c-format
-msgid "Saving %d messsage(s)"
-msgstr ""
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -14458,107 +14553,103 @@ msgstr ""
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr ""
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
+msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr ""
 
@@ -14586,17 +14677,17 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14605,84 +14696,84 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr ""
 
@@ -14730,7 +14821,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr ""
 
@@ -14738,11 +14829,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr ""
 
@@ -14765,7 +14856,7 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr ""
 
 #: mail/message-tags.glade.h:7
@@ -14962,7 +15053,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -14985,81 +15076,81 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_نام پرونده:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr ""
 
@@ -15067,7 +15158,7 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15101,11 +15192,11 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15114,10 +15205,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr ""
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -15159,15 +15246,15 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr ""
 
@@ -15215,7 +15302,6 @@ msgstr ""
 
 #: 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 ""
 
@@ -15258,15 +15344,15 @@ msgid "Create a new test item"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+msgid "<b>Active Connections</b>"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+msgid "Active Connections"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -15375,28 +15461,28 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15416,97 +15502,106 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr ""
 
-#: 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 ""
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "نشانی پست الکترونیکی"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr ""
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+msgid "Enter new password for certificate database"
+msgstr ""
+
+#: smime/gui/component.c:70
+msgid "Enter new password"
+msgstr ""
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -15690,7 +15785,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr ""
 
@@ -15961,7 +16057,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -15970,8 +16066,8 @@ msgid "Previews the contacts to be printed"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr ""
 
@@ -16019,13 +16115,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr ""
 
@@ -16046,14 +16142,10 @@ msgid "_Save as VCard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -16061,58 +16153,54 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Delete All Occurrences"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:6
-msgid "Delete the appointment"
+msgid "Delete All Occurrences"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Delete this Occurrence"
+msgid "Delete the appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:8
-msgid "Delete this occurrence"
+msgid "Delete this Occurrence"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:9
-msgid "Go To"
+msgid "Delete this occurrence"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:10
-msgid "Go back"
+msgid "Go To"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go forward"
+msgid "Go back"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
+msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "فهرست"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "بعدی"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "قبلی"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr ""
@@ -16121,7 +16209,7 @@ msgstr ""
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr ""
 
@@ -16130,34 +16218,54 @@ msgid "Purge old appointments and meetings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "انتخاب نام‌ها"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "انتخاب نام‌ها"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "انتخاب نام‌ها"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "نمایش یک هفته"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "نمایس هفته‌ی کاری"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "امروز"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "هفته"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr ""
 
@@ -16422,7 +16530,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -16589,306 +16697,306 @@ msgid "F_orward As..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Filter on Mailing _List..."
+msgid "Filter _Junk"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Filter on Se_nder..."
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Filter on _Recipients..."
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Subject..."
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
-msgid "Flag selected message(s) for follow-up"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:38
-msgid "Follow _Up..."
+msgid "Filter the selected messages for junk status"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:39
-msgid "Force images in HTML mail to be loaded"
+msgid "Flag selected message(s) for follow-up"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "بعدی"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "اندازه‌ی اصلی"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "قبلی"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "ا_ندازه‌ی متن"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_درشت‌تر"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "پیغام _بعدی"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_ابزارها"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr ""
 
@@ -17154,39 +17262,39 @@ msgstr ""
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr ""
 
@@ -17315,10 +17423,15 @@ msgid "_Day View"
 msgstr "نمایش روز"
 
 #: views/calendar/galview.xml.h:3
-msgid "_Month View"
+#, fuzzy
+msgid "_List View"
 msgstr "نمایش ماه"
 
 #: views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "نمایش ماه"
+
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "نمایش هفته‌ی کاری"
 
@@ -17347,10 +17460,15 @@ msgid "_Messages"
 msgstr "_پیغام‌ها"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
+msgid "With _Due Date"
 msgstr ""
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "ایالات متحده"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr ""
 
@@ -17406,14 +17524,10 @@ msgstr "دسچپجشی"
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "اکنون"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "امروز"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -17423,82 +17537,87 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "اروپای مرکزی"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "چینی"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "سیریلی"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "یونانی"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "عبری"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "ژاپنی"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "کره‌ای"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "ترکی"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "یونی‌کد"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "اروپای غربی"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "اروپای غربی"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "سنتی"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "ساده‌شده"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "اوکراینی"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr ""
 
@@ -17561,11 +17680,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "تاریخ آغاز:"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr ""
 
@@ -17585,15 +17709,15 @@ msgstr "_پیشرفته..."
 msgid "Choose Image"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr ""
 
@@ -17623,15 +17747,16 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "نشانی"
+
 #~ msgid "Work Address"
 #~ msgstr "نشانی کاری"
 
 #~ msgid "Birthdays"
 #~ msgstr "روزهای تولد"
 
-#~ msgid "_Folder:"
-#~ msgstr "_پوشه:"
-
 #~ msgid "East Timor"
 #~ msgstr "تیمور شرقی"
 
@@ -17661,6 +17786,3 @@ msgstr ""
 
 #~ msgid "Card"
 #~ msgstr "کارت"
-
-#~ msgid "1 card"
-#~ msgstr "۱ کارت"
diff --git a/po/fi.po b/po/fi.po
index 4a75e2e38b..b57edab7e9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-02-04 20:45+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
@@ -16,6 +16,47 @@ msgstr ""
 "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 Osoitekirja"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Näytä paikalliset osoitekansiot"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Tallenna nimellä"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kortteja"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "kortteja"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Yhteystiedot: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution hälytys"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
@@ -93,75 +134,91 @@ msgstr "Hallitse S/Mime varmenteitasi täältä"
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Osoitekirja '%s' poistetaan. Oletko varma että haluat jatkaa?"
 
-#: 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 "Uusi osoitekirja"
 
-#: 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 "Poista"
 
-#: 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 "Ominaisuudet..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Uusi osoitekirja"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Osoitekirja"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Luo uusi tehtävä"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Yhdistäminen LDAP-palvelimeen epäonnistui"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kirjautuminen LDAP-palvelimelle epäonnistui"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Kyselyä Juuri-DSE:lle ei voitu suorittaa"
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "Palvelin ei palauttanut tuettuja hakupohjia"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tämä palvelin ei tue LDAPv3 skeemooja"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Virhe haettaessa skeeman tietoja"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Palvelin ei vastannut kelvollisella skeematiedolla"
 
@@ -190,17 +247,17 @@ msgstr "Siirretään  '%s'"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
@@ -253,7 +310,7 @@ msgstr "Osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kysely
 msgid "This query did not complete successfully."
 msgstr "Tämä kysely ei valmistunut menestyksellisesti."
 
-#: 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."
@@ -261,7 +318,7 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Tarkista että polku on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: 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."
@@ -269,7 +326,7 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Olet joko syöttänyt virheellisen URI:n tai "
 "LDAP-palvelinta ei tavoiteta."
 
-#: 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 "
@@ -279,7 +336,7 @@ msgstr ""
 "tuen Evolutioniin, tulee sinun kääntää ohjelma CVS-lähdekoodista "
 "asennettuasi OpenLDAPin alla olevasta linkistä."
 
-#: 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."
@@ -287,28 +344,28 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
 "ei voida tavoittaa."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSyötä salasana palvelulle %s (käyttäjä %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 "Yhteystietolähteiden UID, joka näytetään näkymässä"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "URI, jonka osoitekirja näyttää"
 
@@ -333,16 +390,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
 #: 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 " Tar_kista tuetut kannat "
 
-#: 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
@@ -357,59 +408,51 @@ msgstr " Tar_kista tuetut kannat "
 #: 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 "Osoitekirjan luonnin apulainen"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Osoitekirjojen lähteet"
-
-#: 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 "Aina"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonyymisti"
 
-#: 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"
@@ -421,54 +464,54 @@ msgstr ""
 "\n"
 "Tallenna syöttämäsi asetukset painamalla \"Toteuta\"-nappia."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Yksikäsitteinen _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: 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 käyttää tätä yksikäsitteistä nimeä sinun todentamiseksesi "
 "palvelimelle"
 
-#: 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 käyttää tätä sähköpostiosoitetta sinun todentamiseksesi "
 "palvelimelle"
 
-#: 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 "Valmis"
 
-#: 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 "Yleiset"
 
-#: 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 "Ryhmä:"
 
-#: 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 "Ei koskaan"
 
-#: 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 +527,19 @@ msgstr ""
 "Kysy järjestelmäsi ylläpitäjältä, käyttääkö LDAP-palvelimesi näitä "
 "protokollia."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Yksi"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "_Hakualue:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Etsitään"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Valittu"
-
-#: 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 +549,7 @@ msgstr ""
 "palvelimeen\n"
 "vain jos se tukee SSL- tai TLS-salausta."
 
-#: 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 +567,7 @@ msgstr ""
 "salausta, koska\n"
 "yhteytesi on jo muutenkin turvallinen."
 
-#: 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 +581,7 @@ msgstr ""
 "turvaan kohdistuville\n"
 "hyökkäyksille."
 
-#: 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 "
@@ -552,7 +591,7 @@ msgstr ""
 "Tämän vaihtoehdon valinta antaa sinun muuttaa Evolutionin oletusasetuksia\n"
 "LDAP-kyselyille sekä yhteystietojen luonnille ja muokkaukselle."
 
-#: 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"
@@ -562,32 +601,32 @@ msgstr ""
 "\t\t\t  on antaa  osoitekirjan näytettävä nimi\n"
 "\t\t\t  ja ryhmä."
 
-#: 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 "Askel 1: Kansion ominaisuudet"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Askel 2: Palvelimen tiedot"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Askel 3: Yhdistetään palvelimelle"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Askel 4: Haetaan hakemistosta"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Ali"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: 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"
@@ -601,7 +640,7 @@ msgstr ""
 "ylläpitäjältä pitääkö\n"
 "näitä oletusarvoja muuttaa."
 
-#: 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"
@@ -612,7 +651,7 @@ msgstr ""
 "jätät tämän\n"
 "tyhjäksi, haut alkavat hakemistopuun juuresta."
 
-#: 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"
@@ -627,7 +666,7 @@ msgstr ""
 "kun taas\n"
 "kattavuus \"Yksi\" kattaa kentät yhden tason hakupohjastasi alaspäin.\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"
@@ -643,13 +682,13 @@ msgstr ""
 "lisäasetuksia. Ota yhteyttä järjestelmäsi ylläpitäjään,\n"
 "jos tarvitse apua näiden asetusten löytämisessä."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP-palvelimesi koko nimi, esimerkiksi \"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"
@@ -659,7 +698,7 @@ msgstr ""
 "asettaminen \n"
 "liian suureksi hidastaa osoitekirjaasi."
 
-#: 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 "
@@ -668,7 +707,7 @@ msgstr ""
 "Määrittele tapa, jolla Evolution tunnistaa sinut. Huomioi, että asetuksen "
 "arvo \"Sähköpostiosoite\" vaatii anonyymiä pääsyäLDAP-palvelimellesi."
 
-#: 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"
@@ -677,7 +716,7 @@ msgstr ""
 "Tämä on nimi, jolla tämä palvelin näkyy Evolutionin kansiolistoissa.\n"
 "Sitä käytetään ainoastaan listoilla näyttämiseen."
 
-#: 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 "
@@ -686,7 +725,7 @@ msgstr ""
 "Tätä nimeä käytetään Evolutionin kansiolistoissa.  Nimeä käytetään vain "
 "tähän käyttöön."
 
-#: 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"
@@ -699,28 +738,28 @@ msgstr ""
 "porttia sinun\n"
 "tulisi käyttää."
 
-#: 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 "Asettaa hakujen suoritukseen käytetyn ajan."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Käytä SSL/TLS-salausta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: 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 "Milloin mahdollista"
 
-#: 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"
@@ -732,60 +771,48 @@ msgstr ""
 "nimi ja kirjautumistietosi. Kysy järjestelmäsi ylläpitäjältä, jos et ole "
 "varma näistä parametreista."
 
-#: 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 "Näytettävä _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: 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 "_Muokkaa"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Tunnistusmenetelmä:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Portin numero:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Aikakatkaisu (minuuttia):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "yhdistetään-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "yleistä-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "haetaan-tab"
 
@@ -817,7 +844,7 @@ msgid "Send HTML Mail?"
 msgstr "Lähetä HTML-postia?"
 
 #: 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 "Lisää yhteystietoihin"
 
@@ -833,7 +860,7 @@ msgstr "Nimi"
 
 #: 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 "Lähde"
 
@@ -900,7 +927,8 @@ msgstr "Yhteistyö"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
@@ -909,7 +937,7 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: 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 "Yksityiskohtaiset"
@@ -994,16 +1022,27 @@ msgstr "Ry_hmät..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Poista"
 
+#: 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 "_Muokkaa"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Koti:"
@@ -1045,22 +1084,22 @@ msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Osoite"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Muokattava"
 
@@ -2042,9 +2081,9 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2057,20 +2096,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:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Palvelu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Sijainti"
 
@@ -2079,112 +2119,96 @@ msgid "Username"
 msgstr "Käyttäjätunnus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Koti"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Työ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Muutettu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Luokkien muokkain ei ole käytettävissä."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Tämä yhteystieto kuuluu näihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Tallenna yhteystieto VCardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa nämä yhteystiedot?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa tämän yhteystiedon?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Työ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kentälle ei voitu löytää widgettiä: '%s'"
@@ -2198,6 +2222,7 @@ msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
@@ -2205,6 +2230,22 @@ msgstr "_Koko nimi:"
 msgid "E-_mail:"
 msgstr "Sähköposti:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa tämän yhteystiedon?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -2307,22 +2348,28 @@ msgid "_Title:"
 msgstr "_Titteli:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "_Tilin nimi:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr "Lisää pikaviestitili"
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "_Tilin nimi:"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+#, fuzzy
+msgid "_IM Service:"
 msgstr "Pikaviestipalvelu:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Sijainti:"
 
+#: 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 "Jäsenet"
@@ -2343,25 +2390,26 @@ msgstr "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 msgid "contact-list-editor"
 msgstr "yhteystiedonhallinta"
 
-#: 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 "Kirja"
 
-#: 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 "Uusi lista"
 
 #. 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 "Yhteystiedonhallinta"
 
-#: 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 "Tallenna lista VCardina"
 
@@ -2413,23 +2461,21 @@ msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1yhteystieto"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d yhteystietoa"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d yhteystietoa"
+msgstr[1] "%d yhteystietoa"
 
-#: 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 "Kysely"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Virhe haettaessa kirjanäkymää"
 
@@ -2441,129 +2487,128 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Nimi alkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
-#: 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 "Luokka on"
 
 #. 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 "Mikä tahansa kenttä sisältää"
 
-#: 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 "Edistyneet..."
 
-#: 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 "Tyyppi"
 
-#: 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 "Osoitekirja"
 
-#: 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 "Tallenna VCardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Uusi yhteystieto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Uusi yhteystietoluettelo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "_Tuo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Etsi yhteystietoja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Osoitekirjan lähteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "_Pilotin asetukset..."
 
-#: 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 "Välitä yhteystieto eteenpäin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Tulosta kuori"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Kopioi osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Siirrä osoitekirjaan..."
 
-#: 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 "Leikkaa"
 
-#. 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 "Kopioi"
 
-#: 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 "Liitä"
 
-#: 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 "Nykyinen näkymä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2576,7 +2621,7 @@ msgstr ""
 "uudestaan"
 
 #. 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 "Mikä tahansa luokka"
@@ -2610,8 +2655,6 @@ msgid "Car Phone"
 msgstr "Autopuhelin"
 
 #: 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 "Ryhmät"
 
@@ -2620,7 +2663,7 @@ msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -2671,6 +2714,7 @@ msgid "Manager"
 msgstr "Johtaja"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
@@ -2679,7 +2723,7 @@ msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Huomio"
 
@@ -2688,7 +2732,7 @@ msgid "Office"
 msgstr "Asema"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -2744,17 +2788,17 @@ msgid "Web Site"
 msgstr "Kotisivu"
 
 #: 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 "Leveys"
 
 #: 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 "Korkeus"
 
 #: 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 "On kohdistettu"
 
@@ -2806,83 +2850,86 @@ msgstr ""
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Valittu"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr "(kartta)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr "kartta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-msgid "work"
-msgstr "työ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 msgid "Position"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Ryhmä"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
 msgstr "Puhelin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
-msgid "personal"
-msgstr "henkilökohtainen"
+#: addressbook/gui/widgets/eab-contact-display.c:319
+msgid "work"
+msgstr "työ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr "henkilökohtainen"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Onnistui"
 
-#: 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
@@ -2890,92 +2937,92 @@ msgstr "Onnistui"
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
-#: 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 "Peruutettu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS ei ole käytettävissä"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "Hylkää"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: 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 "Virhe lisättäessä yhteystietoa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Virhe muokattessa yhteystietoa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: 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 "Virhe poistettaessa yhteystietoa"
 
-#: 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"
@@ -2984,7 +3031,7 @@ msgstr ""
 "%d yhteystiedo avaaminen avaisi myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2993,49 +3040,49 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Kirjoita yli"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Virhe tallennettaessa %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 "kortti.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr "Valitse osoitekirja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Useita VCardeja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard %s:lle"
@@ -3071,33 +3118,31 @@ msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
 msgid "Querying Address Book..."
 msgstr "Etsitään osoitekirjasta..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Muokkaa yhteystietoja"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Yhdistä sähköpostiosoite"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "ja %d muuta yhteystietoa."
-
-#: 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 "ja yksi muu yhteystieto"
+msgid_plural "and %d other contacts."
+msgstr[0] "ja yksi muu yhteystieto"
+msgstr[1] "ja yksi muu yhteystieto"
 
-#: 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 "Näytä kaikki yhteystiedot"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Näytä pieni vCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
@@ -3245,7 +3290,7 @@ msgstr "Reunukset"
 msgid "Number of columns:"
 msgstr "Sarakkeiden määrä:"
 
-#: 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 "Asetukset"
 
@@ -3425,7 +3470,7 @@ msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
 #: 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 "Syötä salasana"
 
@@ -3502,7 +3547,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolutionin tehtävien komponentti"
 
 #: 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"
@@ -3548,24 +3593,24 @@ msgstr "Torkkumisaika (minuutteja)"
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: 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 "Avaa"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr "Hylkää"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr "Hylkää kaikki"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3578,12 +3623,12 @@ msgstr ""
 "Alkaa %s\n"
 "Päättyy %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 "Varoitus"
 
-#: 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"
@@ -3595,7 +3640,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: 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 "
@@ -3612,7 +3657,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: 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 "Älä kysy tästä ohjelmasta enää uudelleen"
 
@@ -3777,13 +3822,13 @@ msgstr "Kommentti sisältää"
 msgid "Location contains"
 msgstr "Kuvaus sisältää"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: 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 "Kalenteri"
 
@@ -3801,7 +3846,7 @@ msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
 #: 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 "päivää"
 
@@ -3812,7 +3857,7 @@ 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.
 #: 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"
 
@@ -3834,71 +3879,71 @@ 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 "Kalenteri '%s' poistetaan. Haluatko varmasti jatkaa?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_Kalenteri"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: 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 ""
 "Kalenterin '%s' avaus tehtävien ja kokousten luontia varten epäonnistui"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
@@ -3928,10 +3973,6 @@ msgstr "Työviikko"
 msgid "Month View"
 msgstr "Kuukausinäkymä"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Listanäkymä"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Virhe avattaessa kalenteria"
@@ -3949,16 +3990,16 @@ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 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 "Kansiota '%s' ei voitu avata"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri näyttää"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Näytettävän näkymän tyyppi"
 
@@ -4022,11 +4063,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "ylimääräisiä kertoja joka"
 
-#: 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 "tuntia"
 
-#: 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 "minuutti"
 
@@ -4049,11 +4090,11 @@ msgstr "Perusasiat"
 msgid "Date/Time:"
 msgstr "Päiväys ja Aika:"
 
-#: 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 "Näytä viesti"
 
-#: 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 "Soita ääni"
 
@@ -4061,17 +4102,17 @@ msgstr "Soita ääni"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: 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 "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
 #: 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 "Kuvaus:"
@@ -4102,7 +4143,7 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #: 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 "minuutti"
 
@@ -4112,8 +4153,8 @@ msgstr "tapaamisen alku"
 
 #. 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 "Käytä"
 
@@ -4127,19 +4168,19 @@ msgstr "Älä poista"
 
 #: 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 "Älä käytä"
 
 #: 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 "Käytä"
 
@@ -4163,7 +4204,7 @@ msgstr "30 minuuttia"
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: 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 "Hälytykset"
 
@@ -4188,7 +4229,7 @@ msgid "Days"
 msgstr "Päivää"
 
 #: 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 "Kä_ytä"
 
@@ -4283,7 +4324,7 @@ msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #: 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 "Työviikko"
 
@@ -4328,7 +4369,6 @@ msgid "_Fri"
 msgstr "_Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Yleistä"
 
@@ -4423,7 +4463,7 @@ msgstr ""
 "Tallenna syöttämäsi asetukset näpäyttämällä \"Toteuta\" nappia."
 
 #: 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 "Uusi tehtävälista"
 
@@ -4583,28 +4623,28 @@ msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %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 " - "
 
-#: 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 " (Valmis "
 
-#: 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 "Valmis"
 
-#: 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 "(erääntyy "
 
-#: 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 "Erääntyy "
 
@@ -4640,8 +4680,9 @@ msgstr "Päiväkirjamerkintä - %s"
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: 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 "Tallenna nimellä..."
 
@@ -4655,31 +4696,18 @@ msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voida käyttää!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Lähdettä ei voitu avata"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "Kohdetta ei voitu avata"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr "Valitse kohde %s"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-msgid "calendar"
-msgstr "kalenteri"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-msgid "task list"
-msgstr "tehtävälista"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4708,19 +4736,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Haluatko varmasti poistaa tämän nimeämättömän päiväkirjamerkinnän?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Haluatko todella poistaa %d tapaamiset?"
+#, 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] "Haluatko todella poistaa %d tapaamiset?"
+msgstr[1] "Haluatko todella poistaa %d tapaamiset?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Haluatko todella poistaa %d tehtävää?"
+#: 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] "Haluatko todella poistaa %d tehtävää?"
+msgstr[1] "Haluatko todella poistaa %d tehtävää?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
+#: 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] "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
+msgstr[1] "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4784,7 +4818,7 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: 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 "Tapaaminen"
 
@@ -4857,8 +4891,6 @@ msgstr "Kalenteri:"
 
 #: 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 "Luokittelu"
 
@@ -4909,13 +4941,13 @@ msgstr "_Alkamisaika:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Määrittelemätön"
 
@@ -4972,13 +5004,13 @@ msgid "Member"
 msgstr "Jäsen"
 
 #: 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 "Kuittauspyyntö"
 
 #: 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
@@ -5150,7 +5182,7 @@ msgid "_No recurrence"
 msgstr "_Ei toistuvuutta"
 
 #: 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 "_Poista"
 
@@ -5192,7 +5224,7 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: 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 "_Hylkää muutokset"
 
@@ -5200,6 +5232,26 @@ msgstr "_Hylkää muutokset"
 msgid "Save Event"
 msgstr "Tallenna tapahtuma"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Valitse tuoja"
+
+#. 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 "Valitse kohde %s"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "kalenteri"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "tehtävälista"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Kokouskutsu on luotu. Lähetetäänkö se?"
@@ -5229,39 +5281,39 @@ msgstr "valmis (%)"
 #: 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 "Valmis"
 
 #: 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 "Korkea"
 
 #: 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 "Työn alla"
 
 #: 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 "Matala"
 
 #: 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 "Tavallinen"
 
 #: 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 "Ei aloitettu"
 
@@ -5275,7 +5327,8 @@ msgid "Undefined"
 msgstr "Määrittelemätön"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "_Valmistumispäivä:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5318,9 +5371,9 @@ msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
 msgid "Con_fidential"
 msgstr "_Luottamuksellinen"
 
-#: 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 "Kuvaus:"
 
@@ -5329,11 +5382,13 @@ msgid "Folder:"
 msgstr "Kansio:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "Eräpäivä:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5385,136 +5440,113 @@ msgid "Weekly"
 msgstr "Viikoittain"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d päivää"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 päivä"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d viikkoa"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 viikko"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d tuntia"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 tunti"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minuuttia"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d päivää"
+msgstr[1] "%d päivää"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minuutti"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d viikkoa"
+msgstr[1] "%d viikkoa"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekuntia"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tuntia"
+msgstr[1] "%d tuntia"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekunti"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuuttia"
+msgstr[1] "%d minuuttia"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Lähetä sähköpostia"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekuntia"
+msgstr[1] "%d sekuntia"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Tullaan suorittamaan tuntematon tehtävä"
 
-#: 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 ennen tapaamisen alkua"
 
-#: 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 tapaamisen alun jälkeen"
 
-#: 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 tapaamisen alussa"
 
-#: 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 ennen tapaamisen loppumista"
 
-#: 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 tapaamisen päättymisen jälkeen"
 
-#: 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 tapaamisen lopussa"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s %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 tuntemattomalle liipasintyypille"
 
-#: 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 "Julkinen"
 
-#: 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 "Henkilökohtainen"
 
-#: 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 "Luottamuksellinen"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Kuvaus"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Päiväys"
 
-#: 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 "Aloituspäivä"
 
-#: 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 "Kuvaus"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "väri "
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "komponentti"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Vapaa"
@@ -5550,141 +5582,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 "Kyllä"
 
-#: 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 "Ei"
 
 #. 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 "Tuntematon"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Poistetaan valitut kohteet"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Päivitetään olioita"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Uusi t_apaaminen..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Uusi koko pä_ivän tapahtuma"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Uusi kokous"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Uusi tehtävä"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "T_ulosta..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "L_iitä"
-
-#: 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 "Siirry _tähän päivään"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "Siirry _päivään..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Julkaise vapaa/varattu-tietoja"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Avaa"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Tallenna _nimellä..."
-
-#: 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 "L_eikkaa"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopioi"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Järjestä kokous..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Välitä iCalendar-muodossa..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Poista tämä _tapahtumakerta"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Poista _kaikki tapahtumakerrat"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Asetukset..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5729,32 +5659,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 "Poistetaan valitut kohteet"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Päivitetään olioita"
+
+#: 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 "_Avaa"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: 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 "Tallenna _nimellä..."
+
+#: 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 "T_ulosta..."
+
+#: 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 "L_eikkaa"
+
+#: 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 "_Kopioi"
+
+#: 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 "L_iitä"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
-#: 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 "_Poista valitut tehtävät"
 
-#: 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 "Lisää tehtävä näpäyttämällä tästä"
 
@@ -5763,38 +5746,101 @@ msgstr "Lisää tehtävä näpäyttämällä tästä"
 msgid "% Complete"
 msgstr "% Valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Hälytykset"
-
-#: 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 "Valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Eräpäivä"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Maantieteellinen sijainti"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Aloituspäivä"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: 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 "Uusi t_apaaminen..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Uusi koko pä_ivän tapahtuma"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Uusi kokous"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Uusi tehtävä"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Valitse _säie"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Valitse..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Julkaise vapaa/varattu-tietoja"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Kopioi kansioon..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Siirrä kansioon..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Järjestä kokous..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Välitä iCalendar-muodossa..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Poista tämä _tapahtumakerta"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Poista _kaikki tapahtumakerrat"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Siirry _tähän päivään"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "Siirry _päivään..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Asetukset..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5826,26 +5872,26 @@ msgstr "%02.i minuutin välein"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -5854,417 +5900,413 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Joka päivä"
+msgid_plural "Every %d days"
+msgstr[0] "Joka päivä"
+msgstr[1] "Joka päivä"
 
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Joka %d:s päivä"
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Joka viikko"
+msgid_plural "Every %d weeks"
+msgstr[0] "Joka viikko"
+msgstr[1] "Joka viikko"
 
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Joka  %d:s viikko"
-
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Viikoittain"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Viikoittain"
+msgstr[1] "Viikoittain"
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Joka  %d:s viikko päivänä"
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s:s päivä"
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "Joka kuukausi"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "Joka %d kuukausi"
+msgid_plural "every %d months"
+msgstr[0] "Joka kuukausi"
+msgstr[1] "Joka kuukausi"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Joka vuosi"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Joka %d vuosi"
+msgid_plural "Every %d years"
+msgstr[0] "Joka vuosi"
+msgstr[1] "Joka vuosi"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr "Kaikkiaan %d kertaa"
+#: 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] "Kaikkiaan %d kertaa"
+msgstr[1] "Kaikkiaan %d kertaa"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", päättyen"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Alkaa:</b>"
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Loppuu:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Valmis:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Erääntyy:</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 "iCalendarin tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: 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 "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Ei mitään</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Sijainti:"
+
 #. 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 "Tila:"
 
-#: 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 "Hyväksytty"
 
-#: 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 "Alustavasti hyväksytty"
 
-#: 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 "Hylätty"
 
-#: 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 "Valitse toiminto:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Päivitä"
 
-#: 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 "Hyväksy"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Hyväksy alustavasti"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Hylkää"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: 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> on julkaissut tapaamistietonsa."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: 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> pyytää %s läsnäoloa tapaamisessa."
 
-#: 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> pyytää läsnäoloasi kokouksessa."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
-#: 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> toivoo pääsyä olemassaolevaan kokoukseen."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: 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> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivtyspyyntö"
 
-#: 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> on vastannut tapaamispyyntöön."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Kokouspyynnön vastaus"
 
-#: 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> on peruuttanut tapaamisen."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Kokouksen peruminen"
 
-#: 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> lähetti järjettömän viestin."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: 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> on julkaissut tehtävätietonsa."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: 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> pyytää %s tekemään työtehtävän."
 
-#: 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> pyytää sinua suorittamaan tehtävän."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Tehtäväehdotus"
 
-#: 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> toivoo lisäystään olemassaolevaan tehtävään"
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: 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> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: 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> on vastannut työtehtävän antoon."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: 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> perui tehtävän."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Tehtävän peruminen"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: 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> on julkaissut vapaa/kiireinen-tietonsa."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: 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> pyytää sinun vapaa/varattu -tietoja."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustulu"
 
-#: 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> on vastannut vapaa/varattu -kyselyyn."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: 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 "Viesti ei näytä olevan kunnolla muotoiltu."
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisältää vain pyyntöjä, jotka eivät ole tuettu."
 
-#: 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 "Liite ei sisällä kelvollista kalenteriviestiä"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenteritiedostoa ei voitu päivittää!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Päivitys valmis\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 ""
 "Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
 
-#: 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 "Kohde on virheellinen eikä sitä voida päivittää\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 "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: 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 "Läsnäolon tilaa ei voitu päivittää virheellisen tilan takia\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 "Virhe CORBA-järjestelmässä\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Kohdetta ei löytynyt\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 "Sinulla ei ole kalenterin päivitykseen vaadittavia oikeuksia\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Osallistujan tilan päivitys epäonnistui!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Poisto valmis"
 
-#: 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 "Lähetetty\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 "Kohdetta ei voitu lähettää!\n"
 
@@ -6399,7 +6441,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6481,12 +6523,12 @@ msgstr "Prioriteetti:"
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Näpäytä avataksesi %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"
@@ -6496,7 +6538,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"
@@ -6507,12 +6549,12 @@ msgstr ""
 "%s\n"
 "on kaatunut."
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6521,49 +6563,54 @@ msgstr ""
 "Virhe avattaessa %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Valtuutetaan seuraavat tehtävät...."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: calendar/gui/gnome-cal.c:1751
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "Ladataan tehtäviä %s"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "Ladataan tehtäviä %s"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 "Kalenterin taustajärjestelmä\n"
 "%s\n"
 "on kaatunut."
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"Tehtävien taustajärjestelmä\n"
+"%s\n"
+"on kaatunut."
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -6584,44 +6631,46 @@ msgid "February"
 msgstr "Helmikuu"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Siirry päivään"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Tammikuu"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Heinäkuu"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Kesäkuu"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Maaliskuu"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Toukokuu"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Marraskuu"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Lokakuu"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Valitse kaikki teksti"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Syyskuu"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "Siirry _tähän päivään"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Valitse kansio"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6711,7 +6760,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
 #. 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 "Verkossa"
 
@@ -6868,81 +6917,81 @@ msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valittu päivä (%a %d.%b.%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 "Valittu viikko (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Valittu kuukausi (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Valittu vuosi (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Tehtävä"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %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 "Ryhmät: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: 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 "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
@@ -6951,38 +7000,38 @@ msgstr "Tulostusasetukset"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Tehtävälista '%s' poistetaan. Oletko varma että haluat jatkaa?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Tehtävälista"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: 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 ""
 "Tehtävälistaa '%s' ei voitu avata uusien tehtävien ja tapaamisten tekemistä "
 "varten"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
@@ -8625,7 +8674,7 @@ msgstr "Välimuistipolun luonti epäonnistui"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tietoa ei voitu avata välimuistista: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8636,7 +8685,7 @@ msgstr ""
 "Myöhempiä toimenpiteitä tällä palvelimella ei toisteta, kun otat\n"
 "uudelleen yhteyttää verkkoon."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8647,7 +8696,7 @@ msgstr ""
 "%s\n"
 "Tähän kansioon tehtyjä muutoksia ei tahdisteta uudestaan."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Uudellentahdistetaan palvelimen kanssa"
 
@@ -8664,7 +8713,7 @@ msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
 msgid "Preparing folder '%s' for offline"
 msgstr "Valmistellaan kansiota '%s' yhteydettömään tilaan"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr ""
 "Sinun täytyy olla yhteydellisessä tilassa suorittaaksesi tämän toiminnon "
@@ -8781,30 +8830,34 @@ msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
 msgid "Performing query on unknown header: %s"
 msgstr "Kysely tuntemattomaan otsakkeeseen: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Toiminto ei ole tuettu: lisää viesti: %s:lle"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s:lle"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toiminto ei ole tuettu: hae UIDien perusteella: %s:lle"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Siirretään viestejä"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: 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 "Suodatetaan uusia viestejä"
 
@@ -8838,7 +8891,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 "Peruutettu."
 
@@ -9222,7 +9276,7 @@ msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
@@ -9420,7 +9474,7 @@ msgstr "Virhe käsittelyssä"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Kansion hakeminen ei onnistu: virheellinen toiminto tässä tallennuspaikassa"
@@ -9430,21 +9484,22 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Roskakori"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskapostia"
 
@@ -9676,17 +9731,17 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
@@ -9721,38 +9776,39 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr "Synkronoi sähköposti etäpalvelimelta automaattisesti"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP-palvelimen nimi:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Osoitekirja"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Hakupohja:"
+#: 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 "Novell GroupWise-palvelinten käyttöä varten"
 
-#: 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 "Salasana"
 
-#: 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 "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "lista"
@@ -9760,12 +9816,12 @@ msgstr "lista"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Toiminto keskeytetty"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
@@ -9823,12 +9879,12 @@ msgstr "Kansio oli tuhottu ja uudelleenluotu palvelimella"
 msgid "Scanning for changed messages"
 msgstr "Etsitään muuttuneita viestejä"
 
-#: 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 "Viestin haku epäonnistui: %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
@@ -9844,25 +9900,25 @@ msgstr ""
 "Viestiä ei voida hakea: %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 "Ei tällaista viestiä"
 
-#: 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 "Tätä viestiä ei ole juuri nyt saatavilla"
 
-#: 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 "Haetaan yhteenvedon tietoja uusista viesteistä"
 
-#: 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 "Viestin runkoa ei löytynyt FETCH-vastauksesta"
 
@@ -9936,18 +9992,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Sähköpostien luku ja tallennus IMAP-palvelimilta."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %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-palvelin %s:lle palvelimella %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
@@ -9957,14 +10013,14 @@ msgstr "IMAP-palvelin %s:lle palvelimella %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Yhteyttä %s:ään (portti %d) ei voitu luoda: %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 ei käytettävissä"
 
-#: 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
@@ -9972,50 +10028,50 @@ msgstr "SSL ei käytettävissä"
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: 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 ""
 "IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %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 laajennos ei ole käytettävissä"
 
-#: 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-kättely epäonnistui."
 
-#: 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 "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Varmennusmenetelmä %s ei ole tuettu"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSyötä IMAP salasana käyttäjälle %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10026,32 +10082,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%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:234
+#: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ylempi kansio ei voi sisältää alikansioita"
 
@@ -10087,20 +10144,20 @@ msgid "Index message body data"
 msgstr "Indeksoi viestin rungon tiedot"
 
 #. $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 "postilaatikko:%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)"
@@ -10161,7 +10218,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"
@@ -10210,8 +10267,8 @@ msgstr "Kansion yhteenvetotiedostoa %s ei voitu poistaa: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kansion sisällysluetteloa %s ei voitu poistaa: %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 "Kansion metatiedon poistaminen epäonnistui '%s': %s"
@@ -10241,14 +10298,14 @@ msgstr "Virheellinen viestin sisältö"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Kansiota '%s' ei voida hakea: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Kansiota `%s' ei voida hakea: kansiota ei ole olemassa."
@@ -10267,7 +10324,7 @@ msgstr "'Kansiota '%s' ei voida avata: se ei maildir-muotoinen hakemisto."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen epäonnistui: %s"
@@ -10276,28 +10333,28 @@ msgstr "Kansion `%s' poistaminen epäonnistui: %s"
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kansiota '%s' ei voitu käydä läpi: %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 "Maildir-kansiota ei voida avata: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Etsitään uusia viestejä"
 
-#: 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
@@ -10345,7 +10402,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Viestin koostaminen epäonnistui: vaurioitunut postilaatikko?"
 
 #: 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 "Tämännimistä kansiota ei voida luoda."
 
@@ -10375,30 +10432,30 @@ msgstr "`%s' ei ole tavallinen tiedosto."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kansio '%s' ei ole tyhjä, sitä ei poistettu."
 
-#: 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 "Hakemistoa %s ei voitu luoda: %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 "Kansiota ei voida luoda: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: 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 "%s:n uudelleennimeäminen epäonnistui: %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 "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
@@ -10442,7 +10499,7 @@ msgstr "Lähdekansiota %s ei voitu sulkea: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Väliaikaista kansiota ei voitu sulkea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
@@ -10485,12 +10542,12 @@ msgstr "Viestin lisäys MH-kansioon peruttiin"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Viestiä ei voida liittää MH-kansioon: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Kansiota '%s' ei voida avata: se ei ole hakemisto."
@@ -10772,46 +10829,46 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Et voi poistaa kansiota uutisryhmistä: lopeta sen sijaan ryhmän tilaaminen."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "Yhteysvirhe: %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 "Kansiota ei ole: %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 "Ryhmää ei voitu hakea: %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 "Viestejä ei voitu hakea: tuntematon virhe"
 
-#: 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-komento epäonnistui: %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: Etsii uusia viestejä"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Tuntematon palvelimen vastaus: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Käytä perumista"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epäonnistui: %s"
@@ -10858,7 +10915,7 @@ msgstr "Poista %s:n päivän kuluttua"
 msgid "Disable support for all POP3 extensions"
 msgstr "Poista käytöstä tuki POP3 laajennoksille"
 
-#: 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"
 
@@ -10947,7 +11004,7 @@ msgid "No such folder `%s'."
 msgstr "Kansiota '%s' ei ole olemassa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11001,12 +11058,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sähköpostin lähetys ohjelman sendmail avulla"
 
-#: 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 ""
 "Sähköpostin lähetys ottamalla yhteyttä sähköpostipalvelimeen SMTP-"
 "protokollalla.\n"
@@ -11129,13 +11187,14 @@ msgid "server does not appear to support SSL"
 msgstr "Palvelin ei näytä tukevan SSL:ää"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS kyselyn aikakatkaisu: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP-komento epäonnistui: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "Virhe STARTTLS vastauksessa"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP-komento epäonnistui: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11169,155 +11228,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP postinvälitys %s:n kautta"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: 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 "Viestiä ei voida lähettää: yksi tai useampi viallinen vastaanottaja"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP tervehdys"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO kyseyn aikakatkaisu: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "Virhe HELO-vastauksessa"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Virhe luotaessa SASL todennusobjektia"
 
-#: 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-kyselyn aikakatkaisu: %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-komento epäonnistui: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH-kysely epäonnistui."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP-komento epäonnistui: %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 "Virheelinen todennusvastaus palvelimelta.\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-kyselyn aikakatkaisu: %s: sähköpostia ei lähetetty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "Virhe MAIL FROM-vastauksessa"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP-komento epäonnistui: %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-kyselyn aikakatkaisu: %s: sähköpostia ei lähetetty"
 
-#: 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> epäonnistui"
 
-#: 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-kyselyn aikakatkaisu: %s: sähköpostia ei lähetetty"
 
 #. 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 "Virhe DATA-vastauksessa"
-
-#: 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:n lähetyksen aikakatkaisu, viesti keskeytettiin: %s: sähköpostia ei "
-"lähetetty"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA terminointivastauksen virhe"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP-komento epäonnistui: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET-kyselyn aikakatkaisu: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "Virhe RSET-vastauksessa"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT-kyselyn aikakatkaisu: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "Virhe QUIT-vastauksessa"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP-komento epäonnistui: %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 "liite"
 
-#: 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 "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
-#: 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 "Tiedoston %s liittäminen epäonnistui: %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 "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
@@ -11339,20 +11400,20 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ehdota liitteen automaattista näyttämistä"
 
-#: 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 ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja näpäyttämällä tästä"
 
@@ -11363,45 +11424,45 @@ msgstr "Avaa osoitekirja näpäyttämällä tästä"
 #. * 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 "Vastausosoite:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: 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 "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: 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."
@@ -11412,11 +11473,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "_Postita:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Valitse kansiot, joihin postituksia lähetetään, näpäyttämällä tästä"
 
@@ -11424,14 +11485,14 @@ msgstr "Valitse kansiot, joihin postituksia lähetetään, näpäyttämällä t�
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: 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 ""
 "Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu sähköpostitilille"
 
-#: 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 +11500,7 @@ msgstr ""
 "Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu "
 "sähköpostitilille"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11448,30 +11509,30 @@ msgstr ""
 "Tiedoston %s lukeminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: 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 "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voida hakea muokkaimelta"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11480,7 +11541,7 @@ msgstr ""
 "Tiedostossa siirtyminen epäonnistui: %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 +11550,7 @@ msgstr ""
 "Tiedoston tiivistäminen epäonnistui: %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 +11559,7 @@ msgstr ""
 "Tiedostokuvaajan kopiointi epäonnistui: %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 +11568,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %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 +11576,7 @@ msgstr ""
 "Ximian Evolution on löytänyt tallentamattomia tiedostoja edellisestä \n"
 "istunnosta. Haluatko yrittää niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11527,42 +11588,47 @@ msgstr ""
 "Haluatko tallentaa muutokset?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Useita viestejä"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Allekirjoitus:"
-
-#: 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 "Automaattisesti luotu"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Allekirjoitus:"
+
+#: 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> tiedosto liitetty"
 msgstr[1] "<b>%d</b> tiedostoa liitetty"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Piilota _liitepalkki (tiputa liitteitä tähän)"
 
-#: 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 "Näytä _liitepalkki (tiputa liitteitä tähän)"
 
-#: 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 "Kirjoita viesti"
 
-#: 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."
@@ -11570,7 +11636,7 @@ msgstr ""
 "Viestin kirjoitusikkunaan ei voitu luoda:\n"
 "Osoitteen valintakontrollia ei voitu aktivoida."
 
-#: 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"
@@ -11582,7 +11648,7 @@ msgstr ""
 "Varmista, että oikea versio ohjelmista gtkhtml ja libgtkhtml\n"
 "on asennettu.\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."
@@ -11590,7 +11656,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11720,7 +11786,7 @@ msgstr ""
 "Mitä Evolutionin tulisi tehdä, kun vastaanotat sähköpostiviestin \"luettu\"-"
 "kuittauspyynnöllä?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11728,15 +11794,15 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Muista tämä salasana"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Muista tämä salasana istunnon loppuun saakka"
 
@@ -11819,13 +11885,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11834,118 +11900,106 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%l %p"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 sekunti sitten"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 sekunti sitten"
+msgstr[1] "1 sekunti sitten"
 
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d sekuntia sitten"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 minuutti sitten"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d minuuttia sitten"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minuutti sitten"
+msgstr[1] "1 minuutti sitten"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 tunti sitten"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d tuntia sitten"
+msgid_plural "%d hours ago"
+msgstr[0] "1 tunti sitten"
+msgstr[1] "1 tunti sitten"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 päivä sitten"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d päivää sitten"
+msgid_plural "%d days ago"
+msgstr[0] "1 päivä sitten"
+msgstr[1] "1 päivä sitten"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 viikko sitten"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d viikkoa sitten"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 viikko sitten"
+msgstr[1] "1 viikko sitten"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "kuukausi sitten"
+msgid_plural "%d months ago"
+msgstr[0] "kuukausi sitten"
+msgstr[1] "kuukausi sitten"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d kuukautta sitten"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 vuosi sitten"
+msgid_plural "%d years ago"
+msgstr[0] "1 vuosi sitten"
+msgstr[1] "1 vuosi sitten"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d vuotta sitten"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Unohdit valita päivän."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<näpäytä valitaksesi päiväys>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "nyt"
 
 #. 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 "Valitse aika johon verrataan"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Suodatinsäännöt"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Tiedostonimi täytyy antaa."
 
-#: 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 "Tiedostoa '%s' ei ole olemassa tai se ei ole tavallinen tiedosto."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Valitse tiedosto"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Sitten"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Erääntyy:</b>"
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: 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 "Valitse kansio"
 
@@ -11959,23 +12013,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 "Tärkeä"
 
 #. 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 "Tehtävää"
 
 #. 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 "Myöhemmin"
 
-#: 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 "Testi"
 
@@ -11983,59 +12037,63 @@ msgstr "Testi"
 msgid "You must name this filter."
 msgstr "Suodattimella täytyy olla nimi."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Säännön nimi: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Jos"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Erääntyy:</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "jos mikään ehdoista täyttyy"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "lähtevät"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Vertaa arvoon"
+msgid "    "
+msgstr " "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Muokkaa suodattimia"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Suodatinsäännöt"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Muokkaa virtuaalikansioita"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vKansioiden lähteet"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Vertaa arvoon"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Tulevat"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Lähtevät"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12043,7 +12101,7 @@ msgstr ""
 "Viestin päiväystä verrataan määritellyn päivän\n"
 " keskipäivään (klo 12:00)"
 
-#: 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."
@@ -12051,7 +12109,7 @@ msgstr ""
 "Viestin päiväystä verrataan suhteessa aikaan\n"
 "jolloin suodatus tapahtuu."
 
-#: 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."
@@ -12059,59 +12117,51 @@ msgstr ""
 "Viestin päiväystä verrataan aikaan, jolloin\n"
 "suodatus tapahtuu."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtuaaliset kansiot"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "Aika suhteessa tämänhetkiseen aikaan"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "sitten"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "kuukautta"
 
-#: 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 "sekuntia"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "vain määritellyt kansiot"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "tämänhetkinen aika"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "määrittelemäsi aika"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vKansioiden lähteet"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "viikkoa"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "kaikille aktiivisille etäkansioille"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "kaikille paikallisille ja aktiivisille etäkansioille"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "kaikille paikallisille kansioille"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "vuotta"
 
@@ -12244,7 +12294,7 @@ msgstr "ei ole merkitty"
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Otsikko"
@@ -12274,8 +12324,9 @@ msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Putkita viesti komennolle"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Poistu ohjelmasta"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12309,23 +12360,24 @@ msgstr "palauttaa suuremman kuin"
 msgid "returns less than"
 msgstr "palauttaa pienemmän kuin"
 
-#: 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 "Suorita ohjelma:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Komento"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Koko (kt)"
@@ -12350,9 +12402,9 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr "Lopeta käsittely"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Aihe"
@@ -12361,17 +12413,13 @@ msgstr "Aihe"
 msgid "Unset Status"
 msgstr "Poista tila"
 
-#: 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 "Sääntö nimeltä '%s' ei ole yksikäsitteinen, valitse toinen."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Säännöt"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
@@ -12383,8 +12431,9 @@ msgstr "Muokkaa sääntöä"
 msgid "Rule name"
 msgstr "Säännön nimi"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Pistemäärien säännöt"
 
 #: filter/searchtypes.xml.h:1
@@ -12419,15 +12468,20 @@ msgstr "Otsikko sisältää"
 msgid "Subject does not contain"
 msgstr "Otsikko ei sisällä"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuaaliset kansiot"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Muuta tämän vKansion nimeä"
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sinun tulee valita vähintään yksi kansio lähteeksi."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "vKansion lähde"
 
@@ -12479,8 +12533,8 @@ msgstr "Evolution sähköpostikansion katselin"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution sähköpostin asetukset"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Sähköposti"
@@ -12489,53 +12543,50 @@ msgstr "Sähköposti"
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: 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 "Sähköpostin asetukset"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Älä poista"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Oletus]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Tilin nimi"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: 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 "Nimeämätön"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Määrittele kelvollinen komentotiedoston nimi."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[komentotiedosto]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Lisää allekirjoituskomentotiedosto"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Lisää allekirjoitus:"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
@@ -12593,7 +12644,7 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voida avata.\n"
 "Haluatko käyttää oletuskansiota luonnoksille?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Luo virtuaalikansio alusta alkaen..."
 
@@ -12623,287 +12674,317 @@ msgstr "Lukemattomia viestejä"
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio näpäyttämällä tästä>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "vKansiot"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Poistetaan kansiota %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Avataan kansiota %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Siirretään viestejä kohteeseen %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Kopioidaan viestejä kohteeseen %s"
+
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kansiota '%s' ei voida siirtää: virheellinen toiminto"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Tallennetaan kansiota %s"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kansiota ei voitu poistaa: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Paikallisen '%s' kansion poistaminen ei onnistu."
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Poistetaanko todella kansio \"%s\" ja kaikki sen alikansiot?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Poista \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Paikallista %s kansiota ei voida nimetä uudelleen."
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä '%s' uudelleen: "
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Kansio nimeltään \"%s\" on jo olemassa. Valitse toinen nimi."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Näytä"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Siirrä"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Nimeä uudestaan"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "_Vastine...."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Merkitse _roskapostiksi"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Merkitse _ei-roskapostiksi"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Toteuta _suodattimet"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Suodatinsäännöt"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VKansio _aiheen perusteella"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "VKansio _lähettäjän perusteella"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "VKansio _vastaanottajien perusteella"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "VKansio _listan perusteella"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr "vKansio säikeen perusteella"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr "_Suodata säikeen perusteella"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Oletukset"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Näpäytä lähettääksesi %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 "Osumia: %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 "Allekirjoittamaton"
 
-#: 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."
@@ -12911,11 +12992,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: 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 "Hyväksytty allekirjoitus"
 
-#: 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."
@@ -12923,11 +13004,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: 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 "Hylätty allekirjoitus"
 
-#: 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."
@@ -12935,11 +13016,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: 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 "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: 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."
@@ -12947,11 +13028,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: 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 "Salaamaton"
 
-#: 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."
@@ -12959,11 +13040,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen matkatessa "
 "lähettäjältä Internetin läpi."
 
-#: 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 "Heikosti salattu"
 
-#: 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 "
@@ -12973,11 +13054,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaanviestin sisällön "
 "käytännöllisen lyhyessä ajassa."
 
-#: 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 "Salattu"
 
-#: 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."
@@ -12985,11 +13066,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: 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 "Salattu vahvalla algoritmilla"
 
-#: 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 "
@@ -12999,31 +13080,31 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältön missään "
 "käytännöllisessä ajassa."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Piilota"
 
@@ -13032,125 +13113,160 @@ msgstr "_Piilota"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %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 "Haetaan %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%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 "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: 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 "Lähettäjä"
 
-#: 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 "Vastausosoite:"
 
-#: 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 "Vastaanottaja"
 
-#: 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 "Kopiot:"
 
-#: 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 "Piilokopiot"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Päiväys"
 
-#: 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 liite"
 
-#: 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 "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
 
-#: 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 "Sisäinen virhe: UID on virheellisessä muodossa: %s"
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Sisäinen virhe: UID on virheellisessä muodossa: %s"
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisäänrakennettu)"
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Joka vuosi"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Joka viikko"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Joka kuukausi"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13163,22 +13279,22 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
 
-#: 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 "POP3-tunnusten välimuistin siirto epäonnistui: %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 "Kansioiden laajennuksen tilan siirto epäonnistui: %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 "Hakemiston '%s' luonti epäonnistui: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Taltion '%s' avaaminen epäonnistui: %s"
@@ -13217,32 +13333,32 @@ msgstr "_Lisää osoitekirjaan"
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %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 "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: 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 "Kansio"
 
 #. 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 "Valitse palvelin."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13251,25 +13367,25 @@ msgstr ""
 "Virhe ladattaessa suodatintietoja:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. 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 "%a, %d-%m-%Y kello %H:%M %%+05d, %%s kirjoitti:"
 
-#: 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"
@@ -13278,7 +13394,7 @@ msgstr ""
 "Tallentaminen ei onnistu \"%s\"\n"
 "%s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13287,35 +13403,35 @@ msgstr ""
 "'%s' on jo olemassa.\n"
 "Kirjoitetaanko yli?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "viesti"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Virhe: `%s' on jo olemassa eikä ole hakemisto."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Lisää osoite"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Viesti %s:ltä"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %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 `%"
@@ -13328,7 +13444,7 @@ msgstr ""
 "\n"
 "Poistetaanko viestit todella?"
 
-#: 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"
@@ -13397,46 +13513,56 @@ msgid "Default height of the Message Window"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Viesti-ikkunan oletuskorkeus"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Viestinkirjoitusikkunan oletusleveys"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Viesti-ikkunan oletusleveys"
 
-#: 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 "Viesti-ikkunan oletusleveys"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: 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 "Tyhjennä kaikki roskakorit kun Evolution suljetaan"
 
-#: 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 "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Viestilistapaneelin korkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Viestilistapaneelin korkeus."
 
-#: 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 "
@@ -13446,15 +13572,19 @@ msgstr ""
 "voidaan käyttää mitä tahansa Gnomen MIME-tyyppientietokannassa määriteltyä "
 "bonobo-komponentin katselinta viestin näyttämiseen."
 
-#: 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 "Etiketit ja niihin liittyvät värit"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Lista tileistä"
 
-#: 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."
@@ -13463,11 +13593,11 @@ msgstr ""
 "merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: 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 "Lista omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: 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."
@@ -13476,15 +13606,15 @@ msgstr ""
 "väri pareja, jossa väri on määäritelty HTML-värien heksadesimaalisessa "
 "muodossa."
 
-#: 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 "Lista MIME-tyypeistä, joille etsitään bonobo komponenttikatselimia"
 
-#: 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 "Hae HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: 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 - "
@@ -13494,82 +13624,90 @@ msgstr ""
 "koskaan hae kuvia verkosta 1 - Hae kuvia, jos lähettäjä on osoitekirjassa 2 "
 "- Hae kuvat aina verkosta"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: 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 "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Viestiikkunan oletuskorkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Viestiikkunan oletusleveys"
 
-#: 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 "Viestin näyttötyyli (normaali, kaikki otsakkeet, lähdekoodi)"
 
-#: 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 "Uudesta postista huomauttava äänitiedosto"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Uutta postia-huomuksen tyyppi"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: 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 ""
 "Kysy vahvistus, kun kansioista poistetaan pysyvästi poistettuja viestejä."
 
-#: 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 ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä poistaa poistettuja"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: 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."
@@ -13577,94 +13715,108 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: 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 ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
 "kenttiä"
 
-#: 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 "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: 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 "Tunnista linkit tekstissä ja korvaa ne linkillä"
 
-#: 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 "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Suorita roskapostitarkistus saapuvalle postille"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "Salainen optio."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "Salainen optio."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Lähetä HTML-postia oletuksena."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina"
 
-#: 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 "Näytä poistetut viestit yliviivattuna viestilistassa."
 
-#: 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 "Näytä poistetut viestit viestilistalla"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Näytä \"Esikatselu\"-paneeli"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Näytä esikatselupaneeli"
 
-#: 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 "Äänitiedosto joka soitetaan, kun uusia viestejä saapuu."
 
-#: 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 ""
 "Määrittelee saapuneiden viestien huomautuksen, jota käyttäjä haluaa käyttää."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Viestiikkunan oletuskorkeus"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Viestiikkunan oletusleveys"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: 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 "Päätekirjasin viestien näyttöön"
 
-#: 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 "Vaihtelevan levyinen kirjasin viestien näyttöön"
 
-#: 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;"
@@ -13675,99 +13827,99 @@ msgstr ""
 "otsakkeita ja sen, näytetäänkö niitä. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - määrittele enabled, jos otsake halutaan näyttää postinäkymässä."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Säikeistä viestilista"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Säikeistä viestilista"
 
-#: 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 "Säikeistä viestilista aiheen perusteella"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Käytä Spamassassin palvelinta ja asiakasta"
 
-#: 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 "Käytä Spamassassin palvelinta ja asiakasta (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Käytä omia kirjasimia viestien näyttöön"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia"
 
-#: 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 "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "Näytä/Bcc on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "Näytä/Bcc on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "Näytä/Cc on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "Näytä/Cc on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "Näytä/Lähettäjä on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "Näytä/Lähettäjä on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "Näytä/Lähetä ryhmään on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "Näytä/Lähetä ryhmään on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "Näytä/Vastausosoite on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "Näytä/Vastausosoite on valittu"
 
-#: 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."
@@ -13775,11 +13927,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "Portti, jossa käyttäjän spamd-palvelinta ajetaan"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "Spamd:n portti"
 
@@ -13818,14 +13970,14 @@ msgstr "Evolution tuo vanhoja Elm-sähköpostejasi"
 #: 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 "Tuodaan..."
 
 #: 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 "Odota, ole hyvä"
 
@@ -13870,12 +14022,12 @@ msgstr "Tuodaan kansiota"
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteettien suodatin \"%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"
@@ -13901,7 +14053,7 @@ msgstr ""
 "prioriteettien sijasta. Tarkista tuodut suodattimen ja varmista,\n"
 "että kaikki toimii vielä kuten oli tarkoitus."
 
-#: 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"
@@ -13913,7 +14065,7 @@ msgstr ""
 "ominaisuuksia, joita Evolution ei tue.\n"
 "Nämä suodattimet poistetaan."
 
-#: 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"
@@ -13927,23 +14079,23 @@ msgstr ""
 "on muutettu tarkistamaan, sisältyykö annettu merkkijono\n"
 "viestin runkoon."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution tuo vanhoja tietojasi Netscapesta"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Tuodaan tietoja Netscapesta"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Asetukset"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: 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?"
@@ -13975,62 +14127,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Tämänhetkinen tallennusmuoto:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Indeksoi rungon sisältö"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Uusi tallennusmuoto:"
-
-#: 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 ""
-"Huomio: siirryttäessä postilaatikkomuotojen välillä vakava virhe,\n"
-"kuten levytilan loppuminen, ei välttämättä ole mahdollista\n"
-"korjattavisssa. Käytä tätä ominaisuutta varoen."
-
-#: 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 "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
 #. 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 "Evolutionin tilimuokkain"
 
-#: 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 "_Isäntäpalvelin:"
 
-#: 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 "Käyttäjät_unnus:"
 
-#: 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 "_Polku:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
@@ -14063,11 +14181,11 @@ msgstr "Vastaukset %s:lle"
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Seuraavat suodatinsäännöt:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14078,47 +14196,47 @@ msgstr ""
 "     '%s'\n"
 "ja on päivitetty."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Lähetä viesti"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Uusi vKansio"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Suodattimet"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Luo uusi kalenteri"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr "URI sähköpostilähteelle,  jonka näkymä näyttää"
 
-#: 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 "Identiteetti"
 
-#: 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 "
@@ -14128,11 +14246,12 @@ msgstr ""
 "kentät eivät ole pakollisia, jollet halua sisältää näitä tietoja "
 "lähettämiisi sähköpostiviesteihin."
 
-#: 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 "Saapuva posti"
 
-#: 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."
@@ -14141,15 +14260,15 @@ msgstr ""
 "et ole varma asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Valitse joku seuraavista vaihtoehdoista"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: 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."
@@ -14158,11 +14277,11 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: 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 "Tilinhallinta"
 
-#: 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 "
@@ -14176,123 +14295,256 @@ msgstr ""
 "sähköpostitilille nimi alla olevaan kenttään. Tätä nimeäkäytetään ainoastaan "
 "ohjelman sisällä tilin näyttämiseen."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
-#: 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 "Yhdistetään palvelimeen..."
 
-#: 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 "Tar_kista tuetut tyypit"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Esikatselu"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL ei ole tuettu tässä Evolutionin käännöksessä)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL ei ole tuettu tässä Evolutionin käännöksessä)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Tila:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Tila:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>_Näytettävät sähköpostin otsakkeet</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 "_Salaa myös itselleni lähetettäessä salattua sähköpostia"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Tilimuokkain"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Tilitiedot"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Tarkastetaan onko uutta sähköpostia"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Lisää _skripti"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Lisää uusi allekirjoitus..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Salaa _aina myös itselle, kun lähetetään salattua sähköpostia"
+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>_Näytettävät sähköpostin otsakkeet</b>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
+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 "Huomautus uudesta sähköpostista"
+
+#: 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 "Lähetetyt viestit ja luonnokset"
+
+#: 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 "_Salaa myös itselleni lähetettäessä salattua sähköpostia"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Tilimuokkain"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Lisää uusi allekirjoitus..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Lisää _skripti"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Salaa _aina myös itselle, kun lähetetään salattua sähköpostia"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Liitä alkuperäinen viesti"
 
-#: 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 "Liite"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Todennus"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Lisää hymiöt kuvina automaattisesti"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "T_arkasta onko uutta postia joka"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balttilainen (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balttilainen (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Piippaa kun uutta sähköpostia saapuu"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Värit"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "Tar_kista tuetut tyypit"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Tarkista _saapuva viestit"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Tarkastetaan onko uutta sähköpostia"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Kirjoita viesti"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Värit"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Asetukset"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Varmista poistettujen lopullinen poisto kansiosta"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14308,275 +14560,263 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi näpäyttämällä nappia \"Toteuta\""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Oletukset"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "_Oletusmerkistö:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Poistetaan viestiä"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "_Allekirjoita digitaalisesti lähtevät viestit (oletuksena)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Älä lainaa alkuperäistä viestiä"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook yhteensopivuus)"
 
-#: 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 "Valmis"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Luonnoskansio:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Sähköpostitilit"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: 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 "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Suorita komento..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "_Tasalevyinen:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Suodatinten asetukset"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nä"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_Lähetä HTML-postia"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Otsakkeet:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "_Korosta lainaukset värillä"
 
-#: 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 "Sisäkkäisesti"
 
-#: 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 "Nimikkeet ja värit"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Ladataan kuvia"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Sähköpostiasetukset"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Viestin muokkain"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Viestin näyttö"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Viestin kirjasimet"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Huomautus uudesta sähköpostista"
-
-#: 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"
 msgstr ""
 "Huomio: salasanaa ei kysytä ennen kuin otat ensimmäistä kertaa yhteyttä"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Valinnaiset tiedot"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Soita äänitiedosto uuden sähköpostin saapuessa"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc vastaanottajia on määritelty"
 
-#: 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 "Tulostettavat kirjasimet"
-
-#: 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 "Lainaa alkuperäinen viesti"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "_Muista tämä salasana"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Muista salasana"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sähköpostia"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Vastaanoton _asetukset"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Muista tämä _salasana"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Pakolliset tiedot"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Palauta oletukset"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Muista salasana"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "_Turvallisuus"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Oletuskirjaisin:"
 
-#: 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 "Turvalli_suus"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Valite HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_Valitse..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Lähetetään sähköpostia"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Lähetetyt viestit ja luonnokset"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Palvelimen asetukset"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Allekirjoitus:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_allekirjoitukset"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "_Oikoluku"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Normaali Unix-postilaatikko"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Päätekirjaisin:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Tyyppi:"
+
+#: 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"
@@ -14586,7 +14826,7 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: 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 "
@@ -14596,7 +14836,7 @@ msgstr ""
 "olevista kielistä riippuu ainoastaan siitä, mille kielille sinulla "
 "onsanastoja asennettuna."
 
-#: 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\""
@@ -14604,15 +14844,15 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Käytä _daemonia"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14622,178 +14862,111 @@ msgstr ""
 "\n"
 "Näpäytä \"Eteenpäin\" aloittaaksesi."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: 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 "Lataa _aina kuvat verkosta"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Todennustapa:"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Todennustapa:"
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "T_arkasta onko uutta postia joka"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Lisää hymiöt kuvina automaattisesti"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Piippaa kun uutta sähköpostia saapuu"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Varmista poistettujen lopullinen poisto kansiosta"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Oletusallekirjoitus:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Oletukset"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "_Allekirjoita digitaalisesti lähtevät viestit (oletuksena)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Käytä"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Salaa lähtevät viestit oletuksena"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Koko nimi:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_Lähetä HTML-postia"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identiteetti"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Roskapostia"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "_Lataa kuvat, jos lähettäjä on osoitekirjassa"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "Vain _paikalliset testit"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: 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 "_Älä koskaan lataa kuvia verkosta"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Soita äänitiedosto uuden sähköpostin saapuessa"
-
-#: 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 ""
 "_Kysy vahvistus, kun lähetetään HTML-viestejä yhteystiedoille, jotka eivät "
 "niitä halua"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus, kun lähetetään viestejä tyhjälle Aihe-otsakkella"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Tuleva posti"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Palauta oletukset"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Komentotiedosto:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Valitse..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Lähetetään viestejä"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Näytä animoidut kuvat"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_allekirjoitukset"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Oletuskirjaisin:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Päätekirjaisin:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Käytä salattua yhteyttä (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minuutti"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "väri "
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "kuvaus"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14802,7 +14975,7 @@ msgstr ""
 "Virhe '%s':ssä:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14811,7 +14984,7 @@ msgstr ""
 "Virhe suoritettessa toimenpidettä:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Suoritetaan"
 
@@ -14819,16 +14992,16 @@ msgstr "Suoritetaan"
 msgid "Filtering Folder"
 msgstr "Suodatetaan kansiota"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14837,116 +15010,115 @@ msgstr ""
 "Lisäys '%s':ään epäonnnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Lähetetään \"%s\""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Virhe viestin %d %d:stä kohdalla"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Virhe viestin %d/%d kohdalla"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Haetaan %d viesti(ä)"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Haetaan %d viesti(ä)"
+msgstr[1] "Haetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Tallennetaan %d viesti(ä)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Tallennetaan %d viesti(ä)"
+msgstr[1] "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14955,7 +15127,7 @@ msgstr ""
 "Tulostiedoston luonti epäonnistui: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14964,11 +15136,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14977,25 +15149,21 @@ msgstr ""
 "Tulostiedostoa ei voida luoda: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voitu kirjoittaa: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudelleen yhteyttää %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr "Muutetaan roskapostitilaa"
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkitystä"
@@ -15008,84 +15176,80 @@ msgstr "Hae viestistä"
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Etsi"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Digitaalinen allekirjoitus"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Salaus"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Palvelin: %s, tyyppi: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Polku: %s, tyyppi: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Tyyppi: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: 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 "Odotetaan..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Käyttäjä keskeytti toimenpiteen"
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "Muista salasana tämän istunnon loppuun asti"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Allekirjoitusta ei voitu tallentaa: %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"
@@ -15095,23 +15259,23 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Anna allekirjoitukselle nimi"
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -15139,17 +15303,17 @@ msgstr "Välitetty viesti"
 msgid "Invalid folder: `%s'"
 msgstr "Virheellinen kansio: ' %s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Asetetaan vKansiota: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Päivitetään vKansioita URI:lle: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15162,84 +15326,84 @@ msgstr ""
 "   '%s'\n"
 "ja ne on päivitetty."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Yritetään muokata vKansiota '%s', jota ei ole olemassa."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Uusi vKansio"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Nähty"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Korkein"
 
-#: 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 "Tänään %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -15287,7 +15451,7 @@ msgstr "Lähetä edelleen"
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Välitä"
 
@@ -15295,11 +15459,11 @@ msgstr "Välitä"
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
@@ -15324,7 +15488,8 @@ msgstr ""
 "Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Erääntyy:"
 
 #: mail/message-tags.glade.h:7
@@ -15530,7 +15695,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: 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 "Valitse tieto jota haluaisit tuoda:"
 
@@ -15559,26 +15724,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Valitse tuoja"
 
-#: 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 "Tiedostoa %s ei ole olemassa"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Tuodaan"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Tuodaan %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 "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15587,31 +15752,31 @@ msgstr ""
 "Tuodaan %s\n"
 "Tuodaan ensimmäistä tietoa"
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Tiedostonimi:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Tuodaan tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: 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"
@@ -15619,25 +15784,25 @@ msgstr ""
 "Odota...\n"
 "Etsitään olemassaolevia asetuksia"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Älykkäät tuojat käynnistyvät"
 
-#: 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 "Ohjelmasta %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Tiedostolel '%s' ei ole käytettävissä tuojaa"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "Tuojan suoritus epäonnistui"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Tuo"
 
@@ -15645,7 +15810,7 @@ msgstr "_Tuo"
 msgid "Closing connections..."
 msgstr "Suljetaan yhteyksiä...."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "_Evolutionin asetukset"
 
@@ -15679,11 +15844,11 @@ msgstr "Jaettua kanstiota ei voitu avata: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Määriteltyä jaettua kansiota ei löydy."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Aloitetaan tuonti"
 
-#: 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 "
@@ -15697,10 +15862,6 @@ msgstr ""
 "\n"
 "Haluatko suljea apulaisen?"
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "Sulje apulainen"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kansion nimeä ei ole määritelty"
@@ -15742,15 +15903,15 @@ msgstr "Bug buddya ei voitu ajaa."
 msgid "About Ximian Evolution"
 msgstr "Tietoja Ximian Evolutionista"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Työskentele _yhteydellisessä tilassa"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
@@ -15806,7 +15967,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 "Uusi"
 
@@ -15860,18 +16020,19 @@ msgid "Create a new test item"
 msgstr "Luo uusi testijuttu"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Aktiiviset yhteydet"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktiiviset yhteydet"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Näpäytä OK sulkeaksesi kaikki yhteydet ja siirtyäksesi yhteydettömään tilaan"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Seuraavat yhteydet ovat tällä hetkellä auki:"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "_Kalenteri"
@@ -15988,28 +16149,28 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muualta\n"
 "Evolutionin käyttöön."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Tuojat"
 
-#: 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 "Tuo"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Älä tuo"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution voi tuoda tietoa seuraavista tiedostoista:"
 
 #. 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"
@@ -16044,7 +16205,7 @@ msgstr ""
 "Toivomme että nautit suuren työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitykseen!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16052,48 +16213,48 @@ msgstr ""
 "Kiitos\n"
 "Evolutionin tiimi\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Älä kerro enää uudelleen"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolutionin kuorta ei voida käyttää."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolutionin kuoren alustus epäonnistui: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uudelleentuo tiedot väkisin Evolution 1.4:stä"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: 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"
@@ -16102,43 +16263,54 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\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 "Valitse tuotava varmenne..."
 
-#: 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 "Varmenteen nimi"
 
-#: 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 "Tarkoitukset"
 
-#: 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 "Sarjanumero"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Vanhenee"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Varmenteen katselin: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Syötä salasana '%s':lle"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Syötä salasana %s:lle"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Syötä salasana"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16330,7 +16502,8 @@ msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 msgid "Your Certificates"
 msgstr "Varmenteesi"
 
-#: 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 "Varmenne on jo olemassa"
 
@@ -16601,7 +16774,7 @@ msgstr "Siirrä yhteystiedot toiseen kansioon..."
 msgid "Move to Folder..."
 msgstr "Siirrä kansioon..."
 
-#: 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 "Liitä leikepöytä"
 
@@ -16610,8 +16783,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
 
@@ -16659,13 +16832,13 @@ msgstr "Pysäytä lataaminen"
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "T_oiminnot"
 
@@ -16686,14 +16859,10 @@ msgid "_Save as VCard"
 msgstr "_Tallenna vCard-muodossa"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Etsi yhteystietoja"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti yhteystiedolle..."
 
@@ -16701,58 +16870,54 @@ msgstr "Lähetä _viesti yhteystiedolle..."
 msgid "Day"
 msgstr "Päivä"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Poista tapaaminen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Poista kohta"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Siirry"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Takaisin"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Mene eteenpäin"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Siirry _päivään"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Siirry tiettyyn päivään"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Siirry tähän päivään"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Seuraava"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Edellinen"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
@@ -16761,7 +16926,7 @@ msgstr "Tulosta tämä kalenteri"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Julkaise vapaa/varattu-tietoja tästä kalenterista"
 
-#: 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 "Tyhjennä"
 
@@ -16770,34 +16935,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Valitse kaikki teksti"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Siirry tiettyyn päivään"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Valitse kansio"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Näytä listana"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Näytä työviikko"
 
-#: 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 "Tänään"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Viikko"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
@@ -17063,7 +17248,7 @@ msgstr "Merkitse ka_ikki luetuksi"
 msgid "Mark all visible messages as read"
 msgstr "Merkitse kaikki näkyvät viestit luetuiksi"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Liitä viestit leikepöydältä"
 
@@ -17229,306 +17414,308 @@ msgid "F_orward As..."
 msgstr "_Välitä muodossa..."
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Suodatinsäännöt"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Suodata postitus_listan mukaan..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Suodata _lähettäjän mukaan..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Merkitse valitut viestit roskapostiksi"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Merkitse valitut viestit kommentoitaviksi"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_Vastine..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Lataa k_uvat"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Merkitse _tärkeäksi"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Merkitse _samantekeväksi"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Siirrä"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Seuraava"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Ei roskapostia"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Avaa valittu viesti muokkaimeen uudelleenlähettämistä varten"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Alkuperäinen _koko"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Postita _vastine"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Kirjoita vastine viestiin julkisessa kansiossa"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Edellinen"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Pienempi"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Näytä sähköpostin _lähdekoodi"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Näytä täydet _otsikkotiedot"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Näytä viesti normaalimuodossa"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Näytä sähköpostiviestin kaikki otsakkeet"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Tekstin _koko"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "vKansio _postilistasta..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "vKansio _lähettäjästä..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "vKansio _vastaanottajista..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "vKansio _aiheesta..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Sisäkkäisesti"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Suurempi"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Viestin näyttö"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Normaali näyttö"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Lainattu"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "_Lähetä uudelleen..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "T_yökalut"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Palauta"
 
@@ -17794,39 +17981,39 @@ msgstr "Kopioi valittu tehtävä"
 msgid "Cut selected task"
 msgstr "Leikkaa valittu tehtävä"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Merkitse _valmiiksi"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Liitä tehtävä leikepöydältä"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Esikatselee listaa tulostettavista tehtävistä"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Tulosta lista tehtävistä"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
@@ -17956,10 +18143,15 @@ msgid "_Day View"
 msgstr "Päivänäkymä"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Listanäkymä"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Kuukausinäkymä"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Työviikk_onäkymä"
 
@@ -17988,10 +18180,16 @@ msgid "_Messages"
 msgstr "_Viestit"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "_Ryhmän mukaan"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Eräpäivä:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Aseta tila"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tehtävät"
 
@@ -18050,14 +18248,10 @@ msgstr "MTKTPLS"
 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 "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Tänään"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18067,82 +18261,87 @@ msgstr "Ajan tulee olla muodossa: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Keskieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Kreikkalainen"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Korealainen"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: 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 "Länsieurooppalainen"
 
-#: 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 "Länsieurooppalainen"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Perinteinen"
 
-#: 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 "Yksinkertaistettu"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Visuaali"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Tuntematon merkistö: %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 "Merkistön koodaus"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Muut..."
 
@@ -18207,11 +18406,16 @@ msgid "Spacing around expander arrow"
 msgstr "Laajennusnuolen ympärillä oleva tila"
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Etsi"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Haun muokkain"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -18231,15 +18435,15 @@ msgstr "_Lisäasetukset..."
 msgid "Choose Image"
 msgstr "Valitse kuva"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Etsi"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: 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 "_Tyhjennä"
 
@@ -18269,6 +18473,329 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmiina)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Osoitekirjojen lähteet"
+
+#~ msgid "Selected:"
+#~ msgstr "Valittu"
+
+#~ msgid "1 contact"
+#~ msgstr "1yhteystieto"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "ja %d muuta yhteystietoa."
+
+#~ msgid "Send an Email"
+#~ msgstr "Lähetä sähköpostia"
+
+#~ msgid "1 day"
+#~ msgstr "1 päivä"
+
+#~ msgid "1 week"
+#~ msgstr "1 viikko"
+
+#~ msgid "1 hour"
+#~ msgstr "1 tunti"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuutti"
+
+#~ msgid "1 second"
+#~ msgstr "1 sekunti"
+
+#~ msgid "Description"
+#~ msgstr "Kuvaus"
+
+#~ msgid "component"
+#~ msgstr "komponentti"
+
+#~ msgid "Alarms"
+#~ msgstr "Hälytykset"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Maantieteellinen sijainti"
+
+#~ msgid "URL"
+#~ msgstr "URL:"
+
+#~ msgid "Every %d days"
+#~ msgstr "Joka %d:s päivä"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Joka  %d:s viikko"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Joka  %d:s viikko päivänä"
+
+#~ msgid "every %d months"
+#~ msgstr "Joka %d kuukausi"
+
+#~ msgid "Every %d years"
+#~ msgstr "Joka %d vuosi"
+
+#~ msgid "Go To Date"
+#~ msgstr "Siirry päivään"
+
+#~ msgid "_Go To Today"
+#~ msgstr "Siirry _tähän päivään"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP-palvelimen nimi:"
+
+#~ msgid "Search base:"
+#~ msgstr "Hakupohja:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "STARTTLS kyselyn aikakatkaisu: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "Virhe STARTTLS vastauksessa"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "HELO kyseyn aikakatkaisu: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "Virhe HELO-vastauksessa"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH-kyselyn aikakatkaisu: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH-kysely epäonnistui."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Virhe MAIL FROM-vastauksessa"
+
+#~ msgid "DATA response error"
+#~ msgstr "Virhe DATA-vastauksessa"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "DATA:n lähetyksen aikakatkaisu, viesti keskeytettiin: %s: sähköpostia ei "
+#~ "lähetetty"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA terminointivastauksen virhe"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "RSET-kyselyn aikakatkaisu: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "Virhe RSET-vastauksessa"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "QUIT-kyselyn aikakatkaisu: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "Virhe QUIT-vastauksessa"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d sekuntia sitten"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minuuttia sitten"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d tuntia sitten"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d päivää sitten"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d viikkoa sitten"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d kuukautta sitten"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d vuotta sitten"
+
+#~ msgid "Then"
+#~ msgstr "Sitten"
+
+#~ msgid "If"
+#~ msgstr "Jos"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Muokkaa suodattimia"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Muokkaa virtuaalikansioita"
+
+#~ msgid "Outgoing"
+#~ msgstr "Lähtevät"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Putkita viesti komennolle"
+
+#~ msgid "Shell Command"
+#~ msgstr "Komento"
+
+#~ msgid "Rules"
+#~ msgstr "Säännöt"
+
+#~ msgid "[script]"
+#~ msgstr "[komentotiedosto]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Lisää allekirjoituskomentotiedosto"
+
+#~ msgid "Current store format:"
+#~ msgstr "Tämänhetkinen tallennusmuoto:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Indeksoi rungon sisältö"
+
+#~ msgid "New store format:"
+#~ msgstr "Uusi tallennusmuoto:"
+
+#~ 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 ""
+#~ "Huomio: siirryttäessä postilaatikkomuotojen välillä vakava virhe,\n"
+#~ "kuten levytilan loppuminen, ei välttämättä ole mahdollista\n"
+#~ "korjattavisssa. Käytä tätä ominaisuutta varoen."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL ei ole tuettu tässä Evolutionin käännöksessä)"
+
+#~ msgid "Account Information"
+#~ msgstr "Tilitiedot"
+
+#~ msgid "Authentication"
+#~ msgstr "Todennus"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Kirjoita viesti"
+
+#~ msgid "Configuration"
+#~ msgstr "Asetukset"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Oletukset"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Poistetaan viestiä"
+
+#~ msgid "Filter Options"
+#~ msgstr "Suodatinten asetukset"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Nimikkeet ja värit"
+
+#~ msgid "Loading Images"
+#~ msgstr "Ladataan kuvia"
+
+#~ msgid "Message Display"
+#~ msgstr "Viestin näyttö"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Viestin kirjasimet"
+
+#~ msgid "Optional Information"
+#~ msgstr "Valinnaiset tiedot"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Tulostettavat kirjasimet"
+
+#~ msgid "Re_member this password"
+#~ msgstr "_Muista tämä salasana"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Muista tämä _salasana"
+
+#~ msgid "Required Information"
+#~ msgstr "Pakolliset tiedot"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Palauta oletukset"
+
+#~ msgid "S_ecurity"
+#~ msgstr "_Turvallisuus"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Secure MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Palvelimen asetukset"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Todennustapa:"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Todennustapa:"
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Oletusallekirjoitus:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Koko nimi:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identiteetti"
+
+#~ msgid "_Junk"
+#~ msgstr "_Roskapostia"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Tuleva posti"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Palauta oletukset"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Lähetetään viestejä"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Lähetetään \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Virhe viestin %d %d:stä kohdalla"
+
+#~ msgid "Changing junk status"
+#~ msgstr "Muutetaan roskapostitilaa"
+
+#~ msgid "Search"
+#~ msgstr "Etsi"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Digitaalinen allekirjoitus"
+
+#~ msgid "Encryption"
+#~ msgstr "Salaus"
+
+#~ msgid "Quit Assistant"
+#~ msgstr "Sulje apulainen"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Seuraavat yhteydet ovat tällä hetkellä auki:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Etsi yhteystietoja"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Siirry _päivään"
+
+#~ msgid "Go to today"
+#~ msgstr "Siirry tähän päivään"
+
+#~ msgid "With _Category"
+#~ msgstr "_Ryhmän mukaan"
+
 #~ msgid "No data provided"
 #~ msgstr "Tietoa ei annettu"
 
@@ -18282,9 +18809,6 @@ msgstr "%s (%d%% valmiina)"
 #~ "Suorita roskapostitarkistus saapovalle sähköpostille IMAP-tileillä (käypä "
 #~ "ainoastaan, jos tarkista_saapuvat on tosi)"
 
-#~ msgid "    "
-#~ msgstr " "
-
 #~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
 #~ msgstr "_Älä tarkista saapuvia viestejä IMAP-tileiltä"
 
diff --git a/po/fr.po b/po/fr.po
index 37efed9c87..1033ea8701 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,14 +15,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-27 23:04+0100\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-27 22:41+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.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
@@ -90,7 +90,6 @@ msgstr "Configurez ici la compilation automatique"
 #. 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
@@ -141,75 +140,91 @@ msgstr ""
 "continuer ?"
 
 #: addressbook/gui/component/addressbook-component.c:313
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
 #: addressbook/gui/component/addressbook-component.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:434 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/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 "Supprimer"
 
 #: addressbook/gui/component/addressbook-component.c:315
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Créer un nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:566
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Créer une nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Nouveau carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Créer une nouvelle tâche"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "La connexion au serveur LDAP a échoué"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "L'authentification sur le serveur LDAP a échoué"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Impossible d'effectuer la requête sur la racine DES."
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "Le serveur a renvoyé des bases de recherche non supportées."
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 "Ce serveur ne supporte pas les informations relatives au schéma LDAPv3."
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Erreur lors de la récupération des informations relatives au schéma"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Le serveur a renvoyé des informations non valides relatives au schéma."
 
@@ -237,21 +252,17 @@ msgid "Migrating `%s':"
 msgstr "Migration de « %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:430 calendar/gui/migration.c:509
+#: 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 "Sur cet ordinateur"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:517
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: 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 "Personnel"
@@ -311,7 +322,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr "Cette requête ne s'est pas terminée correctement."
 
-#: 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."
@@ -319,7 +330,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Veuillez vérifier que le chemin "
 "existe et que vous avez la permission d'accès."
 
-#: 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."
@@ -327,7 +338,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: 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 "
@@ -337,7 +348,7 @@ msgstr ""
 "utiliser LDAP dans Evolution, vous devez compiler le programme à partir des "
 "sources CVS après avoir récupéré OpenLDAP à l'adresse indiquée ci-dessous."
 
-#: 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."
@@ -345,28 +356,28 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses."
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSaisissez le mot de passe pour %s (utilisateur %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 "l'UID de la source des contatcs que la vue affichera"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "L'URI que le calendrier affichera."
@@ -393,15 +404,10 @@ msgstr ""
 "L'URI du dossier utilisé en dernier dans le dialogue de sélection de noms"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  Affic_her les bases dupportées"
 
-#: 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
@@ -423,52 +429,44 @@ msgstr "  Affic_her les bases dupportées"
 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 "Assistant de création du carnet d'adresses"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Sources du carnet d'adresses..."
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Toujours"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonymement"
 
-#: 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"
@@ -480,52 +478,52 @@ msgstr ""
 "Cliquez sur le bouton « Appliquer » pour enregistrer les paramètres que vous "
 "avez saisi."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "_Nom distinctif :"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Adresse électronique :"
 
-#: 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 utilisera ce DN pour vous authentifier sur le serveur."
 
-#: 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 utilisera cette adresse électronique pour vous authentifier sur le "
 "serveur."
 
-#: 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 "Terminé"
 
-#: 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 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Général"
 
-#: 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 "Groupe :"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Jamais"
 
-#: 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"
@@ -541,23 +539,19 @@ msgstr ""
 "administrateur système si votre serveur\n"
 "LDAP utilise ces protocoles."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Un"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Domain_e de recherche : "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Recherche"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Sélectionné :"
-
-#: 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"
@@ -567,7 +561,7 @@ msgstr ""
 "LDAP\n"
 "uniquement si votre serveur LDAP supporte SSL et 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"
@@ -584,7 +578,7 @@ msgstr ""
 "se trouve derrière un pare-feu, Evolution n'aura pas besoin d'utiliser \n"
 "SSL/TLS car votre connexion est déjà sécurisée."
 
-#: 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"
@@ -598,7 +592,7 @@ msgstr ""
 "vulnérable aux\n"
 "problèmes de sécurité."
 
-#: 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 "
@@ -610,7 +604,7 @@ msgstr ""
 "par défaut pour les recherches LDAP ainsi que pour la création et l'édition "
 "des 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"
@@ -619,32 +613,32 @@ msgstr ""
 "Spécifiez un nom d'affichage et un groupe est la première étape\n"
 "nécessaire à la configuration d'un carnet d'adresses."
 
-#: 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 "Étape 1 : Caractéristiques du dossier"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Étape 2 : Informations sur le serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Étape 3 : Connexion au Serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Étape 4 : Rechercher dans l'annuaire"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sous"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Bases de recherche supportées"
 
-#: 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"
@@ -658,7 +652,7 @@ msgstr ""
 "toute\n"
 "modification concernant ces 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"
@@ -671,7 +665,7 @@ msgstr ""
 "racine de \n"
 "l'arborescence de l'annuaire."
 
-#: 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"
@@ -688,7 +682,7 @@ msgstr ""
 "trouvant un niveau\n"
 "en dessous de la 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"
@@ -704,7 +698,7 @@ msgstr ""
 "nadministrateur système si vous avez besoin d'aide pour trouver ces\n"
 "informations."
 
-#: 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"
 "\"."
@@ -712,7 +706,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur ldap. Par exemple, « ldap."
 "monentreprise.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"
@@ -721,7 +715,7 @@ msgstr ""
 "Ceci représente le nombre maximum d'entrées à télécharger. Un nombre\n"
 "trop élevé ralentira l'accès à votre carnet d'adresses."
 
-#: 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 "
@@ -731,7 +725,7 @@ msgstr ""
 "Notez que spécifier « Adresse électronique » implique l'accès anonyme au "
 "serveur."
 
-#: 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"
@@ -741,7 +735,7 @@ msgstr ""
 "dossiers d'Evolution\n"
 "(dans un but d'affichage uniquement)."
 
-#: 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 "
@@ -751,7 +745,7 @@ msgstr ""
 "d'Evolution\n"
 "(dans un but d'affichage uniquement)."
 
-#: 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"
@@ -763,28 +757,28 @@ msgstr ""
 "administrateur\n"
 "système le port à utiliser."
 
-#: 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 "Cette option indique le temps d'exécution d'une requête. "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Utili_ser SSL/TLS :"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Lorsque c'est 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"
@@ -796,60 +790,48 @@ msgstr ""
 "vos informations d'identification. En cas de doute, veuillez contacter votre "
 "administrateur système."
 
-#: 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 "_Nom d'affichage :"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: 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:17
-#: mail/mail-config.glade.h:160 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 "_Éditer"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Méthode d'identification :"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Numéro de port :"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Nom du _serveur :"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Temps d'attente maximum (minutes) :"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "Connexion"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "Recherche"
 
@@ -897,7 +879,7 @@ msgstr "Nom"
 
 #: 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"
 
@@ -964,7 +946,8 @@ msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1059,15 +1042,26 @@ msgstr "Ca_tégories..."
 #. 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-calendar-table.c:1057 calendar/gui/e-calendar-table.c:1075
-#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1366
-#: mail/em-folder-tree.c:2504 mail/em-folder-view.c:765
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Supprimer"
 
+#: 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 "_Éditer"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Domicile :"
@@ -2106,7 +2100,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:2813
+#: 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"
@@ -2121,7 +2115,7 @@ msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2816
+#: 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"
@@ -2144,22 +2138,22 @@ msgid "Username"
 msgstr "Nom d'utilisateur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2481
-#: addressbook/gui/contact-editor/e-contact-editor.c:2777
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Domicile"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2781
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: 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 "Travail"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2482
-#: addressbook/gui/contact-editor/e-contact-editor.c:2785
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Autre"
 
@@ -2194,46 +2188,46 @@ msgstr "Modifié"
 msgid "Account Name"
 msgstr "Nom du compte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1463
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Éditeur de catégorie non disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1471
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories :"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1695
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2480
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: 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:2814
+#: 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:2815
+#: 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:2817
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossible de trouver un composant graphique pour un champ :  `%s'"
@@ -2392,6 +2386,10 @@ msgstr "Service d'IM :"
 msgid "_Location:"
 msgstr "Lieu :"
 
+#: 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 "Membres"
@@ -2417,7 +2415,7 @@ msgstr "Éditeur de liste de contacts"
 #: 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"
@@ -2429,6 +2427,7 @@ msgstr "Est une nouvelle liste"
 
 #. Construct the app
 #: 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 "Éditeur de liste de contacts"
 
@@ -2493,7 +2492,7 @@ msgstr[1] "%d contacts"
 #
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c: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"
@@ -2511,30 +2510,31 @@ msgstr "Modèle"
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Le nom commence par"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
-#: 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 "La catégorie est"
 
 #. 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 "Tout champ contient"
 
-#: 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 "Avancée..."
 
-#: 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:12
 #: calendar/gui/e-meeting-list-view.c:249
@@ -2542,95 +2542,96 @@ msgstr "Avancée..."
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Nouveau contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Nouvelle liste de contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Aller au Dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Rechercher des contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Sources du carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Envoyer un message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Copier dans le carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Déplacer dans le carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:432 calendar/gui/tasks-component.c:363
+#: 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 "Copier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: 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 "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1302
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Vue courante"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2643,7 +2644,7 @@ msgstr ""
 "l'utiliser de nouveau."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Toute catégorie"
@@ -2954,7 +2955,6 @@ msgstr "Succès"
 #: 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/imap4/camel-imap-store.c:263
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
@@ -3177,17 +3177,17 @@ msgstr "Vue carte"
 msgid "GTK Tree View"
 msgstr "Affichage de l'arborescence GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test de reformatage"
 
-#: 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 "Ceci devrait tester l'élément de reformatage du canvas"
 
@@ -3879,7 +3879,7 @@ msgid "Purge events older than"
 msgstr "Purger les événements plus vieux que"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "jours"
 
@@ -3889,12 +3889,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:1589 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"
 
@@ -3922,67 +3918,67 @@ msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Le calendrier « %s » va être supprimé. Êtes-vous sûr de vouloir continuer ?"
 
-#: calendar/gui/calendar-component.c:430
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:926
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/calendar-component.c:927
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: calendar/gui/calendar-component.c:928
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Créer un nouveau rendez-vous"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: calendar/gui/calendar-component.c:935
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Créer une nouvelle demande de réunion"
 
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous sur une journée entière"
 
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Créer un nouveau rendez-vous journée entière"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "C_alendrier"
 
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Créer un nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:1016
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir le calendrier « %s » pour créer des événements et des "
 "réunions"
 
-#: calendar/gui/calendar-component.c:1028
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Il n'y a pas de calendrier disponible pour créer des événements et des "
@@ -4104,11 +4100,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "toutes les"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "heures"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "minutes"
 
@@ -4194,8 +4190,8 @@ msgstr "Début du rendez-vous"
 
 #. 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:493
-#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
+#: 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 "Activé"
 
@@ -4209,19 +4205,19 @@ msgstr "Ne pas supprimer"
 
 #: 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:399
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Désactiver"
 
 #: 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:401
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Activer"
 
@@ -4365,7 +4361,7 @@ msgid "Wednesday"
 msgstr "Mercredi"
 
 #: 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 "Sem. travail"
 
@@ -4511,7 +4507,7 @@ msgstr ""
 "que vous avez saisi."
 
 #: 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 "Nouvelle liste de tâches"
 
@@ -4735,8 +4731,8 @@ msgid "No summary"
 msgstr "Aucun résumé"
 
 #: calendar/gui/dialogs/comp-editor.c:1360
-#: calendar/gui/e-calendar-table.c:1190 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
@@ -5000,16 +4996,11 @@ msgid "_Start time:"
 msgstr "Heure de _début :"
 
 #. 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:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: 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:443
@@ -5256,7 +5247,7 @@ msgid "_No recurrence"
 msgstr "_Aucune récurrence"
 
 #: 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 "_Enlever"
 
@@ -5298,7 +5289,7 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: 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 "Aban_donner les modifications"
 
@@ -5363,7 +5354,7 @@ msgstr "Achevée"
 
 #: 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 "Haute"
 
@@ -5376,13 +5367,13 @@ msgstr "En cours"
 
 #: 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 "Basse"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Normal"
 
@@ -5677,14 +5668,9 @@ msgstr "Non"
 #: 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/imap4/camel-imap-engine.c:1524
-#: camel/providers/imap4/camel-imap-engine.c:1551
-#: camel/providers/imap4/camel-imap-engine.c:1581
-#: camel/providers/imap4/camel-imap-engine.c:1621
-#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
-#: 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 "Inconnu"
 
@@ -5740,84 +5726,84 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:698 calendar/gui/e-calendar-view.c:680
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:861 calendar/gui/e-calendar-view.c:781
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1382
+#: 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 "_Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site internet"
 
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1316 calendar/gui/e-calendar-view.c:1388
+#: 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 "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1082
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1317
-#: calendar/gui/e-calendar-view.c:1386 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: 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:23
+#: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: calendar/gui/e-calendar-view.c:1322 calendar/gui/e-calendar-view.c:1364
+#: 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 "Co_uper"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1362
-#: mail/em-folder-tree.c:2497 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
+#: 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 "_Copier"
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1080
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1324
-#: calendar/gui/e-calendar-view.c:1384 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
+#: 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 "C_oller"
 
-#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Assigner une tâche"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: 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 "_Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1368
+#: calendar/gui/e-calendar-table.c:1371
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -5828,7 +5814,7 @@ msgid "% Complete"
 msgstr "% Fait"
 
 #: 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:597
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Terminé"
 
@@ -5855,80 +5841,81 @@ msgstr "Date de début"
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1374
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/e-calendar-view.c:1288 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
 msgid "New All Day _Event"
 msgstr "Nouvel événement journée _entière"
 
-#: calendar/gui/e-calendar-view.c:1289 calendar/gui/e-calendar-view.c:1378
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-calendar-view.c:1304 calendar/gui/e-calendar-view.c:1370
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Aller à _aujourd'hui"
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Sélectionner par _fil de discussion"
 
-#: calendar/gui/e-calendar-view.c:1305 calendar/gui/e-calendar-view.c:1372
-msgid "_Go to Date..."
-msgstr "A_ller à la date..."
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Sélectionner..."
 
-#: calendar/gui/e-calendar-view.c:1309 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1274
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1275
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1330
+#: calendar/gui/e-calendar-view.c:1276
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1277
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: calendar/gui/e-calendar-view.c:1390 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Aller à _aujourd'hui"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "A_ller à la date..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Paramétres..."
 
 #. 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"
@@ -5952,33 +5939,26 @@ msgstr "%02i divisions par minute"
 
 #. 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:1572
+#: 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:1605
+#: 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:822 calendar/gui/e-week-view.c:593
+#: 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:825 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6077,6 +6057,7 @@ msgstr "Erreur iCalendar"
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -6157,7 +6138,7 @@ msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
@@ -6526,10 +6507,6 @@ msgstr "%A %d %B %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
@@ -6538,10 +6515,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6625,12 +6598,12 @@ msgstr "Priorité :"
 msgid "Web Page:"
 msgstr "Site internet :"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6681,22 +6654,22 @@ msgstr "Suppression des objets sélectionnés..."
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/gnome-cal.c:1758
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: calendar/gui/gnome-cal.c:1777
+#: calendar/gui/gnome-cal.c:1779
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: calendar/gui/gnome-cal.c:1797
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: calendar/gui/gnome-cal.c:1926
+#: calendar/gui/gnome-cal.c:1928
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6704,7 +6677,7 @@ msgstr ""
 "%s\n"
 "est tombé en panne."
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1940
 #, fuzzy, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
@@ -6712,7 +6685,7 @@ msgstr ""
 "%s\n"
 "est tombé en panne."
 
-#: calendar/gui/gnome-cal.c:2752
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Purger"
 
@@ -6733,44 +6706,46 @@ msgid "February"
 msgstr "Février"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Aller à la date"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Janvier"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juillet"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juin"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Octobre"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Sélectionner tout le texte"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembre"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "A_ller à aujourd'hui"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Sélectionnez un dossier"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6860,7 +6835,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "Sur internet"
 
@@ -7102,38 +7077,38 @@ msgstr ""
 "La liste de tâches « %s » va être supprimée. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Créer une nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Nouvelle liste des tâches"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Liste des tâches"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Créer une nouvelle liste des tâches"
 
-#: 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 ""
 "Impossible d'ouvrir la liste de tâches « %s » pour créer des événements et "
 "des réunions"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Il n'y a pas de calendrier disponible pour créer des tâches"
 
@@ -8996,7 +8971,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Annulé."
 
@@ -9391,7 +9366,7 @@ msgstr "Les références ont expiré."
 #: 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:1198
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'authentification en provenance du serveur."
 
@@ -9588,29 +9563,29 @@ msgstr "Erreur de traitement"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signataire : %s <%s> : %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Impossible d'obtenir le dossier : opération non valide sur ce stockage"
 
-#: camel/camel-store.c:242
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Impossible de créer le dossier « %s » : le dossier existe"
 
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossible de créer le dossier : opération non valide sur ce stockage"
 
-#: camel/camel-store.c:377 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 "Impossible de supprimer le dossier : %s : opération non valide"
 
-#: camel/camel-store.c:773 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Corbeille"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: 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"
@@ -9934,12 +9909,12 @@ msgstr "liste"
 #: 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:2902
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2905
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
@@ -10111,22 +10086,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lecture et stockage du courrier sur des serveurs IMAP"
 
-#: camel/providers/imap/camel-imap-store.c:425
-#: camel/providers/imap4/camel-imap-store.c:141
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Serveur IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:427
-#: camel/providers/imap4/camel-imap-store.c:143
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Service IMAP pour %s sur %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap-store.c:184
-#: camel/providers/imap4/camel-imap-store.c:201
+#: 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
@@ -10136,16 +10107,14 @@ msgstr "Service IMAP pour %s sur %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossible de se connecter à %s (port %d) : %s."
 
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap-store.c:186
+#: 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 non disponible"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:801
-#: camel/providers/imap4/camel-imap-store.c:198
+#: 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
@@ -10153,51 +10122,50 @@ msgstr "SSL non disponible"
 msgid "Connection cancelled"
 msgstr "Connexion annulée"
 
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/imap4/camel-imap-store.c:262
+#: 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 "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
 
-#: camel/providers/imap/camel-imap-store.c:636
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extension SSL/TSL non supportée."
 
-#: camel/providers/imap/camel-imap-store.c:667
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Les négociations SSL ont échoué"
 
-#: camel/providers/imap/camel-imap-store.c:804
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Impossible de se connecter avec la commande « %s » : %s"
 
-#: camel/providers/imap/camel-imap-store.c:1228
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le mécanisme d'authetification de type %s."
 
-#: camel/providers/imap/camel-imap-store.c:1238
+#: 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 "Aucun support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: 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 "%sVeuillez saisir le mot de passe IMAP pour %s@%s."
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:1304
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10208,22 +10176,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1723
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Aucun dossier de type « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1734
-#: camel/providers/imap/camel-imap-store.c:2023
-#: camel/providers/imap4/camel-imap-store.c:611
+#: 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 ""
 "Le nom de dossier « %s » n'est pas valide car il contient le caractère « %c »"
 
-#: camel/providers/imap/camel-imap-store.c:1758
+#: 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
@@ -10231,127 +10198,15 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Impossible de créer le dossier « %s » : le dossier existe."
 
-#: camel/providers/imap/camel-imap-store.c:2035
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Dossier parent inconnu : %s"
 
-#: camel/providers/imap/camel-imap-store.c:2071
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers."
 
-#: camel/providers/imap4/camel-imap-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP server %s: %s"
-msgstr "Réponse inattendue du serveur IMAP : %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:410
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap-engine.c:416
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:1134
-#: camel/providers/imap4/camel-imap-engine.c:1523
-#: camel/providers/imap4/camel-imap-engine.c:1550
-#: camel/providers/imap4/camel-imap-engine.c:1580
-#: camel/providers/imap4/camel-imap-engine.c:1620
-#: camel/providers/imap4/camel-imap-utils.c:289
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Serveur déconnecté de manière inattendue : %s"
-
-#: camel/providers/imap4/camel-imap-engine.c:1135
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:237
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
-
-#: camel/providers/imap4/camel-imap-store.c:349
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Impossible de se connecter au serveur POP %s : aucun support pour le "
-"mécanisme d'authentification demandé."
-
-#: camel/providers/imap4/camel-imap-store.c:394
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVeuillez saisir le mot de passe SMTP pour %s sur l'hôte %s"
-
-#: camel/providers/imap4/camel-imap-store.c:468
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-"Impossible de authentifier sur le serveur IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap4/camel-imap-store.c:647
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap-store.c:652
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Impossible de créer le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap-store.c:674
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
-
-#: camel/providers/imap4/camel-imap-store.c:703
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap-store.c:708
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap-store.c:766
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap-store.c:771
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Impossible de créer le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap-store.c:810
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap-store.c:815
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Impossible de créer le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap-utils.c:83
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Réponse inattendue du serveur IMAP : %s"
-
-#: camel/providers/imap4/camel-imap-utils.c:106
-#, fuzzy
-msgid "No data"
-msgstr "Aucune donnée fournie"
-
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10384,20 +10239,20 @@ msgid "Index message body data"
 msgstr "Indexer les données de corps des messages"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: 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:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "boîte : %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10748,7 +10603,7 @@ msgstr "Impossible de fermer le dossier source %s : %s."
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s."
@@ -11608,44 +11463,44 @@ msgstr "Échec de la commande IMAP : %s"
 msgid "QUIT command failed"
 msgstr "Échec de la commande IMAP : %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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: 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 "Supprimer les éléments sélectionnés de la liste des pièces jointes"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Ajouter une pièce jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au 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 "Impossible de joindre le fichier %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 ""
@@ -11668,20 +11523,20 @@ msgstr "Type MIME :"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
-#: 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 "Vous devez configurer un compte avant de pouvoir composer un message."
 
 #
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destination de la contribution"
 
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Choisir les dossiers auxquels envoyer ce message."
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
@@ -11692,45 +11547,45 @@ msgstr "Cliquez ici pour le carnet d'adresses"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:573
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:579
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Objet :"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: 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."
@@ -11742,11 +11597,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Poster à :"
 
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 
@@ -11754,14 +11609,14 @@ msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
-#: 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 ""
 "Impossible de signer le message sortant : pas de certificat de signature "
 "définit pour ce compte"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11769,7 +11624,7 @@ msgstr ""
 "Impossible de chiffrer le message sortant : aucune certificat de chiffrement "
 "définit pour ce compte."
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11778,30 +11633,30 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: 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 "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Impossible de récupérer le message de l'éditeur."
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11810,7 +11665,7 @@ msgstr ""
 "Impossible de rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11819,7 +11674,7 @@ msgstr ""
 "Impossible de tronquer le fichier : %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"
@@ -11828,7 +11683,7 @@ msgstr ""
 "Impossible de copier le descripteur de fichier : %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11837,7 +11692,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du 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?"
@@ -11846,7 +11701,7 @@ msgstr ""
 "précédente.\n"
 "Voulez-vous essayer de les récupérer ?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11857,47 +11712,47 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "Message sans titre"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Avertissement : message modifié"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Signature :"
-
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1317
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "Généré automatiquement"
 
-#: 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> fichier attaché"
 msgstr[1] "<b>%d</b> fichiers attachés"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Masquer la barre des pièces _jointes (déposer les pièces jointes ici)"
 
-#: 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 "Afficher la barre des pièces _jointes (déposer les pièces jointes ici)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Composer un 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."
@@ -11905,7 +11760,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "activation du composant de sélection d'adresses impossible."
 
-#: 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"
@@ -11917,7 +11772,7 @@ msgstr ""
 "Veuillez vous assurer que vous avez les bonnes\n"
 "versions de gtkhtml et libgtkhtml.\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."
@@ -11925,7 +11780,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "activation du composant « Éditeur HTML » impossible."
 
-#: composer/e-msg-composer.c:4239
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12085,16 +11940,12 @@ msgstr "Synchroniser les catégories"
 
 #. 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"
@@ -12146,31 +11997,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12251,6 +12094,11 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison."
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Règles de filtrage"
+
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Vous devez indiquer un nom de fichier."
@@ -12288,18 +12136,18 @@ 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:90
+#: 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
+#: 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 "À faire"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Plus tard"
@@ -12350,45 +12198,23 @@ msgstr "    "
 
 #: filter/filter.glade.h:2
 #, fuzzy
-msgid "<b>Filter Rules</b>"
-msgstr "Règles de filtrage"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>Virtual _Folders</b>"
-msgstr "Dossiers Virtuels"
-
-#: filter/filter.glade.h:4
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
 msgstr "Règles de filtrage"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 #, fuzzy
 msgid "<b>vFolder Sources</b>"
 msgstr "Sources de dossier virtuel"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Comparer avec"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Éditer les filtres"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Éditer les dossiers virtuels"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrant"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Sortant"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12396,7 +12222,7 @@ msgstr ""
 "La date du message sera comparée à la date\n"
 "spécifiée (12:00)"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12404,7 +12230,7 @@ msgstr ""
 "La date du message sera comparée à une date\n"
 "relative au moment où le filtre est exécuté."
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12412,51 +12238,51 @@ msgstr ""
 "La date du message sera comparée à la date\n"
 "actuellee au moment du filtrage."
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "une date relative à la date actuelle"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "passé(e)s"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "mois"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "secondes"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "dossiers spécifiques seulement"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "la date actuelle"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "une date que vous spécifiez"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semaines"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "avec tous les dossiers actifs distants"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "avec tous les dossiers actifs locaux et distants"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "avec tous les dossiers locaux"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "années"
 
@@ -12699,7 +12525,7 @@ msgstr "Débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: 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
@@ -12711,7 +12537,7 @@ msgid "Unset Status"
 msgstr "Statut non défini"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Le nom de la règle « %s » n'est pas unique. Choisissez-en un autre."
@@ -12728,8 +12554,9 @@ msgstr "Éditer la règle"
 msgid "Rule name"
 msgstr "Nom de la règle"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Règles des scores"
 
 #: filter/searchtypes.xml.h:1
@@ -12764,6 +12591,11 @@ msgstr "L'objet contient"
 msgid "Subject does not contain"
 msgstr "L'objet ne contient pas"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Dossiers Virtuels"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Vous devez nommer ce dossier virtuel."
@@ -12825,8 +12657,8 @@ msgstr "Afficheur de dossiers courrier d'Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Préférences de la messagerie d'Evolution"
 
-#: 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 "Courrier"
@@ -12839,49 +12671,46 @@ msgstr "Comptes de messagerie"
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Ne pas supprimer"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:445
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Défaut]"
 
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protocole"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
-#: 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 "Sans nom"
 
-#: mail/em-composer-prefs.c:336
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Vous devez spécifier un nom de script valide."
 
-#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
-msgid "[script]"
-msgstr " [script]"
-
-#: mail/em-composer-prefs.c:878
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Langues"
 
-#: mail/em-composer-prefs.c:926
-msgid "Add script signature"
-msgstr "Ajouter une signature script"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "A_jouter une signature"
 
-#: mail/em-composer-prefs.c:946
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Signatures"
 
@@ -12940,7 +12769,7 @@ msgstr ""
 "Impossible d'ouvrir le dossier Brouillons pour ce compte.\n"
 "Voulez-vous utiliser le dossier Brouillons générique ?"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
@@ -12974,7 +12803,7 @@ msgstr "<cliquez ici pour sélectionner un dossier>"
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: 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:"
@@ -12986,7 +12815,7 @@ msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
@@ -13003,120 +12832,120 @@ msgstr "Boîte de réception"
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: mail/em-folder-tree.c:883
+#: mail/em-folder-tree.c:886
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/em-folder-tree.c:885
+#: mail/em-folder-tree.c:888
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Impossible de déposer le ou les messages dans le stockage de haut niveau"
 
-#: mail/em-folder-tree.c:1947
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Impossible de déplacer le dossier « %s » : opération non valide"
 
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: 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 "Sélectionnez un dossier"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2035
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Créer un dossier"
 
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Impossible de supprimer le dossier : %s"
 
-#: mail/em-folder-tree.c:2361
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Impossible de supprimer le dossier local « %s »."
 
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Réellement supprimer le dossier « %s » et tous ses sous-dossiers ?"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Supprimer « %s »"
 
-#: mail/em-folder-tree.c:2411
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Impossible de renommer le dossier local « %s »."
 
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
 
-#: mail/em-folder-tree.c:2492 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 "Afficha_ge"
 
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Déplacer"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
@@ -13267,22 +13096,22 @@ msgstr "Imprimer le message"
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer sur le message %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 "Correspond : %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 "Non signé"
 
-#: 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."
@@ -13290,11 +13119,11 @@ msgstr ""
 "Ce message n'est pas signé. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: 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 "Signature valide"
 
-#: 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."
@@ -13302,11 +13131,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: 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 "Signature non valide"
 
-#: 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."
@@ -13314,11 +13143,11 @@ msgstr ""
 "La signature de ce message ne peut être vérifiée, il se peut qu'il ait été "
 "altéré durant la transmission."
 
-#: 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 "Signature valide, impossible de vérifier l'expéditeur"
 
-#: 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."
@@ -13326,11 +13155,11 @@ msgstr ""
 "Ce message est signé avec une signature valide mais l'expéditeur du message "
 "ne peut être vérifié."
 
-#: 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 "Non chiffré"
 
-#: 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."
@@ -13338,11 +13167,11 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être vu lors de son passage "
 "sur 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 "Chiffré, faiblement"
 
-#: 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 "
@@ -13352,11 +13181,11 @@ msgstr ""
 "difficile, mais pas impossible pour un extérieur de voir le contenu de ce "
 "message dans une période de temps raisonnable."
 
-#: 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 "Chiffré"
 
-#: 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."
@@ -13364,11 +13193,11 @@ msgstr ""
 "Ce message est chiffré. Il sera difficile pour un extérieur de voir le "
 "contenu de ce 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 "Chiffré, fortement"
 
-#: 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 "
@@ -13378,31 +13207,31 @@ msgstr ""
 "vraiment difficile, pour un extérieur, de voir le contenu de ce message dans "
 "une période de temps raisonnable."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Complété le %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "par %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Masquer"
 
@@ -13411,92 +13240,92 @@ msgstr "_Masquer"
 msgid "Page %d of %d"
 msgstr "Page %d sur %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 "Récupération de « %s »"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Partie corps externe mal formée"
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%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 "Pointeur sur le fichier local (%s) valide sur le site « %s »"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: mail/em-format-html.c:1406 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:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1406 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:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: mail/em-format-html.c:1406 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:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/em-format-html.c:1406 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
+#: 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:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: 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:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
+#: 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-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr ""
 
@@ -13574,22 +13403,22 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution déplace vos dossiers..."
 
-#: 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 "La migration des uid de caches pop3 a échoué : %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 "La migration des état d'expansion des dossiers a échoué : %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 "La création du répertoire « %s » a échoué : %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "L'ouverture du stockage « %s » a échoué : %s"
@@ -13628,33 +13457,33 @@ msgstr "A_jouter dans le carnet d'adresses"
 msgid "Open in %s..."
 msgstr "Ouvrir dans %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 ""
 "Ce stockage ne supporte pas les abonnements, ou ils ne sont pas activés."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: 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 "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:831
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné."
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13663,25 +13492,25 @@ msgstr ""
 "Erreur de chargement des informations du filtre :\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. 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 "Le %a, %d/%m/%Y à %H:%M %%+05d, %%s a écrit :"
 
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13690,7 +13519,7 @@ msgstr ""
 "Impossible d'enregistrer dans « %s »\n"
 " %s"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13699,36 +13528,36 @@ msgstr ""
 "« %s » existe déjà.\n"
 "L'écraser ?"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Erreur : « %s » existe et n'est pas un fichier normal"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Enregistrer le message..."
 
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
 
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossible de créer de répertoire temporaire : %s."
 
 #
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13743,7 +13572,7 @@ msgstr ""
 "Effacer réellement ces messages ?"
 
 #
-#: mail/em-utils.c:2477
+#: 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"
@@ -13813,50 +13642,60 @@ msgid "Default height of the Message Window"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Hauteur par défaut de la fenêtre des messages"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Largeur par défaut de la fenêtre de composition"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: 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 "Largeur par défaut de la fenêtre des messages"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Afficher les indicateurs d'erreurs d'orthographe sur les mots que vous "
 "entrez."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: 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 "Vider les dossiers Corbeille en quittant 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 ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: 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 "
@@ -13867,19 +13706,19 @@ msgstr ""
 "qui est assigné à une vue de composant bonobo dans la base des types mime "
 "GNOME pouvant être utilisée pour l'affichage du contenu."
 
-#: 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:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "Liste des étiquettes et des couleurs qui leur sont associées."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: 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."
@@ -13888,11 +13727,11 @@ msgstr ""
 "liste contient des chaînes désignant les noms des sous-répertoires relatifs "
 "à /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-têtes personnelles et de leur activation."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: 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."
@@ -13901,16 +13740,16 @@ msgstr ""
 "Cette liste contient des chaînes de type nom:couleur où les couleurs "
 "utilisant l'encodage hexadecimal HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste des types mime à vérifier pour les composants bonobo de visualisation"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr "Charger les images pour les messages HTML utilisant http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: 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 - "
@@ -13921,92 +13760,92 @@ msgstr ""
 "Charger les images si l'expéditeur est dans le carnet d'adresses 2 - "
 "Toujours charger les images à partir du net"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 "Enregistrer les actions des filtres dans le fichier de journal spécifié."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu après le délai spécifié"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu après le délai spécifié."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Style d'affichage des messages (normal, en-têtes complètes, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: 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:47
+#: 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:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "Fichier sonore de notification des nouveaux courriers"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Type de notification des nouveaux courriers"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Demander pour les objets vides"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quant qu'il ou elle essaie de purger un dossier."
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: 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 ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans object."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Demander si l'utilisateur purge"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: 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."
@@ -14014,103 +13853,113 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans To ou "
 "Cc définis."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Demander si l'utiliseur essaye d'envoyer des message HTML non désirés"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 "Reconnaître les frimousses dans le texte et les remplacer par des images."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Lancer le test de spam sur les messages entrants"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courrier au format HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courrier au format HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées et animations."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimés (comme barrés) dans la liste des messages."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marqués comme supprimés dans la liste des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Afficher le panneau « Aperçu »"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Afficher le panneau « Précédent »."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Jouer un fichier son lors de l'arrivée de nouveaux messages."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Spécifie le type de notification d'arrivée de courrier que l'utilisateur "
 "désire utiliser."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Hauteur par défaut de la fenêtre des messages"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Largeur par défaut de la fenêtre des messages"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: 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:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "Les polices de terminal pour l'affichage des mails"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 "Sélection d'une police HTML à largeur variable pour l'afficher des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: 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;"
@@ -14122,99 +13971,99 @@ msgstr ""
 "est &lt;header enabled&gt; - activé si l'en-tête est affichée dans la vue du "
 "courrier."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Liste de messages par fil de discussion."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Liste de messages par fil de discussion"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basée sur les sujets"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Délai avant de marquer les messages comme vus"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Délai avant de marquer les messages comme vus."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Chaîne UID pour le compte par défaut."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Utiliser le démon et le client Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Utiliser le démon et le client Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Utiliser des polices personnalisées"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Utiliser des polices personnalisées pour afficher le courrier"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Utiliser seulement des tests de spam locaux."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Utiliser seulement des tests de spam locaux (pas de DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Largeur de polices variable"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "L'élément du menu Affichage/Bcc est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "L'élément du menu Affichage/Bcc est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "L'élément du menu Affichage/Cc est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "L'élément du menu Affichage/Cc est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "L'élément du menu Affichage/De est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "L'élément du menu Affichage/De est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'élément du menu Affichage/Répondre À est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'élément du menu Affichage/Répondre À est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: 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."
@@ -14222,11 +14071,11 @@ msgstr ""
 "Retomber sur le tri par sujets quand les messages ne contiennent pas d'en-"
 "tpete In-Reply-To ou References."
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "Port sur lequel démarrer spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "Port pour spamd"
 
@@ -14265,14 +14114,14 @@ msgstr "Evolution importe vos anciens courriers Elm"
 #: 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 "Importation..."
 
 #: 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 "Veuillez patienter"
 
@@ -14319,12 +14168,12 @@ msgstr "Importation des boîtes à lettres"
 msgid "Scanning %s"
 msgstr "Examen de %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtre de priorité : %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"
@@ -14349,7 +14198,7 @@ msgstr ""
 "Netscape en scores Evolution pour les filtres concernés.\n"
 "Nous vous conseillons de vérifier les filtres importés."
 
-#: 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"
@@ -14362,7 +14211,7 @@ msgstr ""
 "dans Evolution.\n"
 "Ces filtres ne seront pas appliqués."
 
-#: 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"
@@ -14376,23 +14225,23 @@ msgstr ""
 "filtres ont été modifiés pour vérifier si la chaîne en question\n"
 "est contenue dans le corps du message."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes données Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Importation des données Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Paramètres"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Filtres de courrier"
 
-#: 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?"
@@ -14424,12 +14273,12 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:145
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
@@ -14445,7 +14294,7 @@ msgstr "_Nom d'utilisateur :"
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:2086
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
@@ -14478,11 +14327,11 @@ msgstr "Réponses à %s"
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Les règles de filtrage suivantes :\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14530,11 +14379,11 @@ msgstr "Créer un nouveau calendrier"
 msgid "URI of the mail source that the view will display"
 msgstr "L'URI d'émission du message que la vue affichera"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identité"
 
-#: 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 "
@@ -14546,12 +14395,12 @@ msgstr ""
 "envoyez."
 
 #
-#: 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 "Réception du courrier"
 
-#: 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."
@@ -14560,15 +14409,15 @@ msgstr ""
 "cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Veuillez effectuer une sélection parmi les options suivantes."
 
-#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Envoi du courrier"
 
-#: 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."
@@ -14577,11 +14426,11 @@ msgstr ""
 "cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: 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 "
@@ -14595,11 +14444,11 @@ msgstr ""
 "Evolution. Veuillez saisir un nom pour ce compte dans l'espace ci-dessous. "
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: 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 "Connexion au serveur"
 
@@ -15258,7 +15107,7 @@ msgstr "description"
 msgid "Pinging %s"
 msgstr "Ping sur %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15267,7 +15116,7 @@ msgstr ""
 "Erreur durant « %s » :\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15276,7 +15125,7 @@ msgstr ""
 "Erreur durant l'exécution de l'opération :\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Travail en cours"
 
@@ -15480,69 +15329,69 @@ msgstr ""
 msgid "Security Information"
 msgstr "Informations de sécurité"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Annulation..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveur : %s, type : %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Chemin : %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 "Envoyer & recevoir le courrier"
 
 #
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: 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 "Attente..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Mémoriser ce mot de passe"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Mémoriser ce mot de passe jusqu'à la fin de la session"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Impossible d'enregistrer le fichier de signature : %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"
@@ -15552,23 +15401,23 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Enregistrer la signature"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Éditer la signature"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Saisissez un nom pour cette signature."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nom :"
 
@@ -15596,17 +15445,17 @@ msgstr "Message transféré"
 msgid "Invalid folder: `%s'"
 msgstr "Dossier non valide : « %s »"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Mise en place du dossier virtuel : %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mise à jour des dossiers virtuels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15619,84 +15468,84 @@ msgstr ""
 "        « %s »\n"
 "et ont été mis à jour."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentative d'édition du dossier virtuel « %s » qui n'existe pas."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: 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 "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: 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 "Génération de la liste des messages"
 
@@ -15992,7 +15841,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Choisissez la destination de cette importation"
 
-#: 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 "Veuillez sélectionner les informations que vous désirez importer :"
 
@@ -16021,26 +15870,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Sélectionnez un assistant d'importation."
 
-#: 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 "Le fichier %s n'existe pas."
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importation de %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 "Erreur de chargement de %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16049,31 +15898,31 @@ msgstr ""
 "Importation de %s\n"
 "Importation de l'élément 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Nom du fichier :"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Sélectionnez un fichier"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Type de fichier :"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'_anciens programmes"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
-#: 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"
@@ -16081,25 +15930,25 @@ msgstr ""
 "Veuillez patienter...\n"
 "Recherche des paramétrages existants"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Lancement des assistants intelligents d'importation"
 
-#: 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 "De %s :"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Aucun importateur disponible pour le fichier « %s »"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "Impossible d'exécuter l'importateur"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importer"
 
@@ -16141,11 +15990,11 @@ msgstr "Impossible d'ouvrir le dossier partagé : %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Impossible de trouver le dossier partagé spécifié."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Démarrage de l'importation"
 
-#: 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 "
@@ -16264,7 +16113,6 @@ msgstr "Case à cocher"
 
 #: 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 "Nouveau"
 
@@ -16318,16 +16166,17 @@ msgid "Create a new test item"
 msgstr "Créer une nouveau élément de test"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Connexions actives"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
+msgid "Active Connections"
+msgstr "Connexions actives"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Les connexions suivantes sont actives :"
+msgid "Click OK to close these connections and go offline"
+msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16445,28 +16294,29 @@ msgstr ""
 "Cet assistant va vous guider dans le processus\n"
 "d'importation de fichiers externes dans Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Assistants d'importation"
 
-#: 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 "Importer"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ne pas importer"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ne plus me demander"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution peut importer des données depuis les fichiers suivants :"
 
-#: shell/main.c:217
-#, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
@@ -16502,7 +16352,7 @@ msgstr ""
 "Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributions !\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16510,48 +16360,48 @@ msgstr ""
 "Merci\n"
 "L'équipe Evolution de Ximian\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ne plus me le dire"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossible d'accéder au shell de Ximian Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossible d'initialiser le shell de Ximian Evolution : %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcer l'arrêt de tous les composants d'Evolution."
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcer la remigration depuis Evolution 1.4"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
 
-#: 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"
@@ -17076,7 +16926,7 @@ msgstr "Déplacer les contacts vers un autre dossier..."
 msgid "Move to Folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: 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 "Colle le contenu du presse-papiers"
 
@@ -17086,7 +16936,7 @@ msgstr "Prévisualiser les contacts à imprimer"
 
 #: 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 "_Aperçu avant impression"
 
@@ -17134,13 +16984,13 @@ msgstr "Arrêter le chargement"
 msgid "View the current contact"
 msgstr "Voir le contact actif"
 
-#: 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"
 
@@ -17161,14 +17011,10 @@ msgid "_Save as VCard"
 msgstr "_Enregistrer comme VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Rechercher des contacts"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Tout sélectionner"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Envoyer un _message au contact..."
 
@@ -17176,58 +17022,54 @@ msgstr "Envoyer un _message au contact..."
 msgid "Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Supprimer toutes les occurrences"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Supprimer le rendez-vous"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Supprimer cette occurrence"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Supprimer cette occurrence"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Aller à"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "En arrière"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "En avant"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Aller à la _date"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Aller à une date précise"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Aller à aujourd'hui"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Suivant"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Prévisualise le calendrier à imprimer"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Précédent"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Imprimer ce calendrier"
@@ -17236,7 +17078,7 @@ msgstr "Imprimer ce calendrier"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publier l'information Libre/Occupé pour ce calendrier"
 
-#: 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_er"
 
@@ -17245,34 +17087,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Purger les anciens rendez-vous et les anciennes réunions"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Sélectionner tout le texte"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Aller à une date précise"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Sélectionnez un dossier"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Afficher comme une liste"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Afficher une journée"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Afficher un mois"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Afficher une semaine"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Afficher la semaine de travail"
 
-#: 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 "Aujourd'hui"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Voir le rendez-vous actuel"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semaine"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Ouvrir rendez-vous"
 
@@ -17814,10 +17676,6 @@ msgstr "Déplacer"
 msgid "Move selected message(s) to another folder"
 msgstr "Déplacer les messages sélectionnés vers un autre dossier"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Suivant"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Message _important suivant"
@@ -17867,10 +17725,6 @@ msgstr "Message i_mportant précédent"
 msgid "Preview the message to be printed"
 msgstr "Prévisualiser le message a imprimer"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Précédent"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Imprimer ce message"
@@ -18281,39 +18135,39 @@ msgstr "Copier la tâche sélectionnée"
 msgid "Cut selected task"
 msgstr "Couper la tâche sélectionnée"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Supprimer les tâches terminées"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Supprimer les tâches sélectionnées"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Mar_quer comme terminé"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Marquer les tâches sélectionnées comme terminées"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Coller la tâche du presse-papiers"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Prévisualiser la liste de tâches à imprimer"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Imprimer la liste de tâches"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Affiche les tâches sélectionnées"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Ouvrir une tâche"
 
@@ -18442,10 +18296,15 @@ msgid "_Day View"
 msgstr "Vue _journalière"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Vue personnalisée"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Vue _mensuelle"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Vue hebdomadaire de _travail"
 
@@ -18474,10 +18333,16 @@ msgid "_Messages"
 msgstr "_Messages"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Avec _catégorie"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Date d'échéance :"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Définir l'état"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tâches"
 
@@ -18540,10 +18405,6 @@ msgstr "%B %Y"
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Aujourd'hui"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18553,82 +18414,87 @@ msgstr "La date doit être dans le format : %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La pourcentage doit être compris entre 0 et 100 inclus."
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Balte"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Europe centrale"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Chinois"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Grec"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japonais"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Coréen"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turc"
 
-#: 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 "Européen de l'ouest"
 
-#: 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 "Européen de l'ouest"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: 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 "Simplifié"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Visuel"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Jeu de caractères inconnu : %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 "Codage des caractères"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caractères à utiliser."
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Autre..."
 
@@ -18694,6 +18560,11 @@ msgstr "Indicateur d'espacement"
 msgid "Spacing around expander arrow"
 msgstr "Espace autour de la flèche de l'expandeur"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Rechercher"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Éditeur de recherche"
@@ -18756,3 +18627,137 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminé)"
+
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Sources du carnet d'adresses..."
+
+#~ msgid "Selected:"
+#~ msgstr "Sélectionné :"
+
+#~ msgid "Go To Date"
+#~ msgstr "Aller à la date"
+
+#~ msgid "_Go To Today"
+#~ msgstr "A_ller à aujourd'hui"
+
+#, fuzzy
+#~ msgid "Unexpected response from IMAP server %s: %s"
+#~ msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#, fuzzy
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#, fuzzy
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#, fuzzy
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "Serveur déconnecté de manière inattendue : %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "Impossible de se connecter au serveur POP %s : aucun support pour le "
+#~ "mécanisme d'authentification demandé."
+
+#, fuzzy
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%sVeuillez saisir le mot de passe SMTP pour %s sur l'hôte %s"
+
+#, fuzzy
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr ""
+#~ "Impossible de authentifier sur le serveur IMAP.\n"
+#~ "%s\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#, fuzzy
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "Impossible de créer le dossier « %s » : %s"
+
+#, fuzzy
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
+
+#, fuzzy
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#, fuzzy
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#, fuzzy
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#, fuzzy
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "Impossible de créer le dossier « %s » : %s"
+
+#, fuzzy
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#, fuzzy
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "Impossible de créer le dossier « %s » : %s"
+
+#, fuzzy
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#, fuzzy
+#~ msgid "No data"
+#~ msgstr "Aucune donnée fournie"
+
+#, fuzzy
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "Règles de filtrage"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Éditer les filtres"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Éditer les dossiers virtuels"
+
+#~ msgid "Outgoing"
+#~ msgstr "Sortant"
+
+#~ msgid "[script]"
+#~ msgstr " [script]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Ajouter une signature script"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Les connexions suivantes sont actives :"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Rechercher des contacts"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Aller à la _date"
+
+#~ msgid "Go to today"
+#~ msgstr "Aller à aujourd'hui"
+
+#~ msgid "With _Category"
+#~ msgstr "Avec _catégorie"
diff --git a/po/ga.po b/po/ga.po
index fd7b4a09f4..f3b1633d3e 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,14 +7,55 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-21 21:56+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \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 "Leabhar Sheoladh Evolution"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Sábháil san leabhar seoladh"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Sábháil Mar"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "cartaí"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 carta"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Tadhallaí: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Coimriú Evolution"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -93,76 +134,92 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Leabhar Seoladh Nua"
 
-#: 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 "Dealaigh"
 
-#: 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 "Álbachtaí..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Líosta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Liosta Tadhaill"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Cruthaigh liosta tadhaill nua"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Leabhar Seoladh Nua"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Leabhar Seoladh:"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Cruthaigh tasc nua"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -187,17 +244,17 @@ msgstr ""
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
 
@@ -242,53 +299,53 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %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 ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr ""
 
@@ -311,16 +368,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -335,67 +386,58 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Roghnachais na Leabhar Sheoladh"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Roghnachais na Leabhar Sheoladh"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Leabhar Seoladh..."
-
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: 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 "i gCónaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Gan ainm"
 
-#: 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"
@@ -403,50 +445,50 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Críochnaithe"
 
-#: 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 "Gnáth"
 
-#: 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 "Grupa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -456,30 +498,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Aon"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -490,7 +528,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -499,7 +537,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -507,39 +545,39 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Ceim 2: Eolas Freastalaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Fó"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -548,7 +586,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -556,7 +594,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -566,7 +604,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -576,41 +614,41 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -618,28 +656,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Ú_sáid SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Ag Úsáid seoladh r-post:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -647,60 +685,48 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Ainm _taispeáint:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_Eagar"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "Uimhir _Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Ainm _Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "cartaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr ""
 
@@ -732,7 +758,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr ""
 
@@ -749,7 +775,7 @@ msgstr "Ainm"
 # Avoid; either use KR or KP
 #: 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 "Foinse"
 
@@ -816,7 +842,8 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr ""
 
@@ -825,7 +852,7 @@ msgid "D_epartment:"
 msgstr "_Roinn:"
 
 #: 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 "Sonraí"
@@ -905,16 +932,27 @@ msgstr "_Catagóire..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Dealaigh"
 
+#: 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 "_Eagar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Baile:"
@@ -956,22 +994,22 @@ msgid "_Web page address:"
 msgstr "Seoladh leathanach greasán:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Seoladh"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr ""
 
@@ -2165,9 +2203,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr ""
 
@@ -2181,20 +2219,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:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Seirbhís"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Áit"
 
@@ -2203,110 +2242,98 @@ msgid "Username"
 msgstr "Ainm Úsaideoir"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Baile"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Obair"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Eile"
 
 # Avoid; either use KR or KP
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Tadhall"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr ""
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Athraithe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Ainm Chuntas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Sábháil Tadhall  mar VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Gnó"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2320,6 +2347,7 @@ msgid "_Edit Full"
 msgstr "_Eagar Ainm Fhada"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "Ainm _Fhada:"
 
@@ -2327,6 +2355,18 @@ msgstr "Ainm _Fhada:"
 msgid "E-_mail:"
 msgstr "R-_phost:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Seoladh _2:"
@@ -2429,22 +2469,28 @@ msgid "_Title:"
 msgstr "_Tidéal:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "Ainm chuntas:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr ""
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "Ainm chuntas:"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
-msgstr ""
+#, fuzzy
+msgid "_IM Service:"
+msgstr "Seirbhís"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Áit:"
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr ""
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr ""
@@ -2465,25 +2511,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "Leabhar"
 
-#: 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 Líosta Nua"
 
 #. 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 "Eagarthôir Líosta Tadhall"
 
-#: 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 "Sábháil Lîosta mar VCard"
 
@@ -2531,24 +2578,22 @@ msgid "No contacts"
 msgstr "Gan Tadhallaí"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 Tadhall"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d Tadhallaí"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d Tadhallaí"
+msgstr[1] "%d Tadhallaí"
 
 # DE
-#: 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 "Ceist"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr ""
 
@@ -2560,134 +2605,133 @@ msgstr "Samhail"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "Ardmód..."
 
-#: 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 "Saghas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Leabhar Seoladh:"
 
-#: 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 "Sábháil mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Líosta Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Téigh go dtí Fillteán..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Albachtaí 'Pilot'..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Priontáil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: 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 "Gearr"
 
-#. 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 "Cóip"
 
-#: 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 "Greamaigh"
 
-#: 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 "Amharc Reatha"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2696,7 +2740,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
@@ -2730,8 +2774,6 @@ msgid "Car Phone"
 msgstr "Fón Char"
 
 #: 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 ""
 
@@ -2741,7 +2783,7 @@ msgstr "Fón Ghnó"
 
 # ta
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Rpost"
 
@@ -2793,6 +2835,7 @@ msgid "Manager"
 msgstr "Bainisteoir"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Fón Phóca"
 
@@ -2801,7 +2844,7 @@ msgid "Nickname"
 msgstr "Leasainm"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Nota"
 
@@ -2810,7 +2853,7 @@ msgid "Office"
 msgstr "Oifig"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Eagrú"
 
@@ -2866,17 +2909,17 @@ msgid "Web Site"
 msgstr "Idirlíon"
 
 #: 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 "Leitheid"
 
 #: 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 "Airde"
 
 #: 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 ""
 
@@ -2922,89 +2965,92 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptar"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "R-phost"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Obair"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "sonraí"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Fón Char"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 #, fuzzy
 msgid "Fax"
 msgstr "Facs Ghnó"
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Leagan"
+msgid "work"
+msgstr "Obair"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
 # PE
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Leagan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Tideal Post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Leathanach Baile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -3012,150 +3058,150 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Earraidh gan fhois"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Ceangailte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Roghnachais na Leabhar Sheoladh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Caith uait"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "Earraidh ag suimigh tadhall"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Earráid ag sábhháil %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 "carta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "líosta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Bog tadhall go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Cóip tadhall go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Bog tadhallaí go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Cóip tadhallaî go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -3192,33 +3238,31 @@ msgstr ""
 msgid "Querying Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Eagar na hEolais Thadall"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "agus %d tadhallaí eile."
-
-#: 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 "agus aon carta eile."
+msgid_plural "and %d other contacts."
+msgstr[0] "agus aon carta eile."
+msgstr[1] "agus aon carta eile."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Sábháil san leabhar seoladh"
 
@@ -3369,7 +3413,7 @@ msgstr "Imill"
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Roghanna"
 
@@ -3546,7 +3590,7 @@ msgid "Unnamed List"
 msgstr "Líosta gan ainm"
 
 #: 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 "Pasfhocal, le do thoil"
 
@@ -3624,7 +3668,7 @@ msgstr "Comhpháirt Tascanna Evolution"
 
 # tg
 #: 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"
@@ -3675,24 +3719,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: 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 "Oscail"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3701,12 +3745,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: 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"
@@ -3714,7 +3758,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3725,7 +3769,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3890,13 +3934,13 @@ msgstr ""
 msgid "Location contains"
 msgstr "Áit"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Féilire"
 
@@ -3912,7 +3956,7 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "lae"
 
@@ -3923,7 +3967,7 @@ msgstr "%A, %e %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3945,70 +3989,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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Féilire Nua"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "Fé_ilire"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4038,10 +4082,6 @@ msgstr "Amharc Seachtain"
 msgid "Month View"
 msgstr "Amharc Mí"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Amharc Líosta"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr ""
@@ -4059,16 +4099,16 @@ msgstr ""
 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 ""
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -4133,11 +4173,11 @@ msgid "extra times every"
 msgstr ""
 
 # xh
-#: 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 "uair"
 
-#: 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 "noimeaíd"
 
@@ -4161,11 +4201,11 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "Dáta/Am:"
 
-#: 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 "Taispeáin scéal"
 
-#: 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 ""
 
@@ -4173,17 +4213,17 @@ msgstr ""
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Rith roghchlár"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Post ríomhphost"
 
 #: 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 "Coimriú:"
@@ -4214,7 +4254,7 @@ msgid "hour(s)"
 msgstr "uair"
 
 #: 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 "noimea(i)d"
 
@@ -4224,8 +4264,8 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr ""
 
@@ -4239,19 +4279,19 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "Míchumasach"
 
 #: 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 "Chumasach"
 
@@ -4276,7 +4316,7 @@ msgid "60 minutes"
 msgstr "60 noiméaid"
 
 # DZ
-#: 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 ""
 
@@ -4301,7 +4341,7 @@ msgid "Days"
 msgstr "Lae"
 
 #: 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 "_Cumasach"
 
@@ -4396,7 +4436,7 @@ msgid "Wednesday"
 msgstr "Ceádaoin"
 
 #: 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 "Seachtain Oibre"
 
@@ -4441,7 +4481,6 @@ msgid "_Fri"
 msgstr "_Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Giniréal"
 
@@ -4530,7 +4569,7 @@ msgid ""
 msgstr ""
 
 #: 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 "Líosta Tasc Nua"
 
@@ -4670,28 +4709,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Críochnaithe "
 
-#: 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 "Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr ""
 
@@ -4727,8 +4766,9 @@ msgstr ""
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: 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 "Sábháil mar..."
 
@@ -4742,35 +4782,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Teip ag oscailt '%s': %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Teip ag oscailt fillteán: %s: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Féilire"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Líosta tasc nua"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4800,18 +4825,24 @@ msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
 #, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
 #, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4873,7 +4904,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Coinne"
 
@@ -4945,8 +4976,6 @@ msgstr "Féilire:"
 
 #: 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 ""
 
@@ -5002,13 +5031,13 @@ msgstr ""
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ar Bith"
 
@@ -5065,13 +5094,13 @@ msgid "Member"
 msgstr "Ball"
 
 #: 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
@@ -5245,7 +5274,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
 msgstr "_Scríos"
 
@@ -5285,7 +5314,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5293,6 +5322,28 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Roghnaigh fillteán"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr ""
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Féilire"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Líosta tasc nua"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
@@ -5322,39 +5373,39 @@ msgstr "% _Rinneadh"
 #: 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 "Críochnaithe"
 
 #: 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 "Ard"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "Bun"
 
 #: 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 "Gnáth"
 
 #: 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 ""
 
@@ -5369,8 +5420,9 @@ msgid "Undefined"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
-msgstr ""
+#, fuzzy
+msgid "_Date completed:"
+msgstr "Crí_ochnaithe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
@@ -5412,9 +5464,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Tuarascail:"
 
@@ -5423,12 +5475,14 @@ msgid "Folder:"
 msgstr "Fillteán:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr ""
+#, fuzzy
+msgid "Sta_rt date:"
+msgstr "Dáta Breithe"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr ""
+#, fuzzy
+msgid "_Due date:"
+msgstr "Dáta:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "Authentication Credentials for HTTP Server"
@@ -5485,136 +5539,113 @@ msgid "Weekly"
 msgstr "Seachtain"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d la(e)"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 lá"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr " %d seachtain"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 seachtain"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d (h)(n-)uaire"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 uair"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr " %d noimeáid"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d la(e)"
+msgstr[1] "%d la(e)"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 noiméad"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] " %d seachtain"
+msgstr[1] " %d seachtain"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d soicínd"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d (h)(n-)uaire"
+msgstr[1] "%d (h)(n-)uaire"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 soicind"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] " %d noimeáid"
+msgstr[1] " %d noimeáid"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Post ríomhphost"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d soicínd"
+msgstr[1] "%d soicínd"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Priobhdach"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Tuarascail"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Dáta"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Coimriú"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "dath"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr ""
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Saor"
@@ -5647,142 +5678,39 @@ msgid ""
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Tá"
 
-#: 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 "Níl"
 
 #. 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 "Gan fhois"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Scríos an sceal seo"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "_Coinne Nua..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Cruinniú Nua"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Tasc Nua"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Priontáil..."
-
-# PS
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Greamaigh"
-
-#: 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 ""
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Oscail"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "_Sábháil Mar..."
-
-#: 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 "G_earr"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Cóip"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Álbachtaí..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5827,33 +5755,87 @@ 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 "Scríos an sceal seo"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr ""
+
+#: 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 "_Oscail"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "_Oscail Leathanach _Lín"
 
-#: 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 "_Sábháil Mar..."
+
+#: 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 "_Priontáil..."
+
+#: 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 "G_earr"
+
+#: 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 "_Cóip"
+
+# PS
+#: 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 "_Greamaigh"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -5862,43 +5844,101 @@ msgstr ""
 msgid "% Complete"
 msgstr "% Rinneadh"
 
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
+msgstr "Críochnaithe."
+
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
+msgstr "Dáta"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Priority"
+msgstr "Tosaíocht"
+
 #: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#, fuzzy
+msgid "Start date"
+msgstr "Dáta Breithe"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Task sort"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "_Coinne Nua..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Cruinniú Nua"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Tasc Nua"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Roghnaigh fillteán"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Roghnaigh..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Cóip do Fillteán..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Bog go Fillteán..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Priority"
-msgstr "Tosaíocht"
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Álbachtaí..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5927,26 +5967,26 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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 "rn"
 
 #. 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 "in"
@@ -5955,416 +5995,412 @@ msgstr "in"
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Gach lá"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Gach %d lá"
+msgid_plural "Every %d days"
+msgstr[0] "Gach lá"
+msgstr[1] "Gach lá"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Gach seachtain"
+msgid_plural "Every %d weeks"
+msgstr[0] "Gach seachtain"
+msgstr[1] "Gach seachtain"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, c-format
-msgid "Every %d weeks"
-msgstr "Gach %d seachtain"
-
-#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Gach %d seachtain dé "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " agus "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "gach mí"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr ""
+msgid_plural "every %d months"
+msgstr[0] "gach mí"
+msgstr[1] "gach mí"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Gach bliain"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] "Gach bliain"
+msgstr[1] "Gach bliain"
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Ag Críochnú:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Críochnaithe:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Eolas iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "Féilire"
 
-#: 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 "Duine anaithnid"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Áit:"
+
 #. 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 "Stádas:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Roghnaigh gníomh:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Glac Leis"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Diúltaigh Dó"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr ""
 
 # FR
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Eolas cruinniú"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Freagra Cruinniú"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Eolas Thasc"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Droch Scéal Tasc"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6503,7 +6539,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6585,12 +6621,12 @@ msgstr "Tosaíocht:"
 msgid "Web Page:"
 msgstr "Leathanach Lín:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6600,7 +6636,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"
@@ -6608,12 +6644,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt tascanna as %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6622,48 +6658,50 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Ag Lódáil íomhanna"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Gan coinní."
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Ag Lódáil íomhanna"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
 # tr
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr ""
 
@@ -6685,47 +6723,49 @@ msgid "February"
 msgstr "Feabhra"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Éanair"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Iuíl"
 
 # GN
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Meitheamh"
 
 # mr
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Marta"
 
 # ms
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Bealtaine"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Samhain"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "D. Fómhair"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Roghnaigh gach teacs"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "M. Fómhair"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr ""
+#, fuzzy
+msgid "_Select Today"
+msgstr "Roghnaigh fillteán"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6807,7 +6847,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -6965,82 +7005,82 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%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 ""
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr ""
 
 # tg
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Tasc"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Stádas: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Tosaíocht: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "Catagóire: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Tadhallaí: "
 
-#: 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 "Priontáil Reamhtaispeántais"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
@@ -7049,36 +7089,36 @@ msgstr "Socraigh Priontáil "
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Tasc"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Líosta tasc nua"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "Líosta _Tasc"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8742,7 +8782,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8750,7 +8790,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8758,7 +8798,7 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr ""
 
@@ -8775,7 +8815,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -8886,30 +8926,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Ag bogadh scéaltaí"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr ""
 
-#: 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 ""
 
@@ -8938,7 +8982,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 "Ceangailte."
 
@@ -9293,7 +9338,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9484,7 +9529,7 @@ msgstr ""
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
@@ -9493,22 +9538,23 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Bruscar"
 
 # GN
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Bruscar"
 
@@ -9715,17 +9761,17 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9757,40 +9803,39 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Ainm do Fhreastalaí"
+msgid "Address Book And Calendar"
+msgstr "Leabhar Seoladh:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "Cuardaigh"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Pasfhocal"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 #, fuzzy
 msgid "Checklist"
 msgstr "líosta"
@@ -9798,12 +9843,12 @@ msgstr "líosta"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9859,12 +9904,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: 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 ""
 
-#: 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
@@ -9878,25 +9923,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9968,18 +10013,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "Freastalaí IMAP %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 "Seirbhís IMAP do %s as %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
@@ -9989,14 +10034,14 @@ msgstr "Seirbhís IMAP do %s as %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10004,49 +10049,49 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10054,32 +10099,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10110,20 +10156,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%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 ""
 
 #. 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)"
@@ -10179,7 +10225,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"
@@ -10228,8 +10274,8 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
@@ -10259,14 +10305,14 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
@@ -10285,7 +10331,7 @@ msgstr "Níl eolaire maildir '%s' ann."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -10294,28 +10340,28 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "níl eolaire maildir ann"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10361,7 +10407,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10389,30 +10435,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Teip ag cruthaigh eolaire '%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 "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "Is ainm fillteán nua neamhdhlíthe."
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Teip ag athainmigh '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Teip ag athainmigh '%s': %s"
@@ -10456,7 +10502,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -10499,14 +10545,14 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Teip ag cruthaigh comhd '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Níl aon Eolaire `%s' ann."
@@ -10777,47 +10823,47 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Earraidh gan fhois: %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 "Níl aon fillteán: %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 "Ní raibh an grúpa ar fáil: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Teip oraithe NNTP: %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 ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
 # FR
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10864,7 +10910,7 @@ msgstr "Scrios indiath %s la(e)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -10944,7 +10990,7 @@ msgid "No such folder `%s'."
 msgstr "Níl aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10996,12 +11042,12 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11119,13 +11165,14 @@ msgid "server does not appear to support SSL"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "Teip oraithe NNTP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr ""
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "Teip oraithe NNTP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11156,153 +11203,155 @@ msgid "SMTP mail delivery via %s"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "Cannot send message: service not connected."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "AUTH request timed out: %s"
-msgstr ""
+#: 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 "Teip oraithe NNTP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr ""
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "Teip oraithe NNTP: %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 ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
+#: 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 "Teip oraithe NNTP: %s"
 
 #. 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 ""
-
-#: 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 ""
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "Teip oraithe NNTP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr ""
+#, fuzzy
+msgid "RSET command failed"
+msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "Teip oraithe NNTP: %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 "ceangaltáin"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Ceangal comhad ar an scéal"
 
-#: 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 "Ní féidir an comhad %s a cheangail: %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 ""
@@ -11325,20 +11374,20 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Ceangal comhad ar an scéal"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr ""
 
@@ -11349,7 +11398,7 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr ""
 
@@ -11357,38 +11406,38 @@ msgstr ""
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Ó:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Ábhar:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "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 ""
 
-#: 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."
@@ -11397,11 +11446,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr ""
 
@@ -11409,69 +11458,69 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11480,13 +11529,13 @@ msgstr ""
 "Earraidh ag sábhháil scéal: %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?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11495,49 +11544,54 @@ msgid ""
 msgstr ""
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Scéal gan tideál)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Oscail Comhad"
 
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
+msgstr "Uathcruthach"
+
 # SG
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2084
 msgid "Signature:"
 msgstr "Siniú:"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
-msgstr "Uathcruthach"
-
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11545,13 +11599,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11665,21 +11719,21 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr ""
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -11762,13 +11816,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11777,119 +11831,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 soicind ó shin"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 soicind ó shin"
+msgstr[1] "1 soicind ó shin"
 
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d soicind ó shin"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 noiméad ó shin"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr " %d noiméaid ó shin"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 noiméad ó shin"
+msgstr[1] "1 noiméad ó shin"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 uair ó shin"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d (h)(n-)uaire ó shin"
+msgid_plural "%d hours ago"
+msgstr[0] "1 uair ó shin"
+msgstr[1] "1 uair ó shin"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 lá ó shin"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d lá ó shin"
+msgid_plural "%d days ago"
+msgstr[0] "1 lá ó shin"
+msgstr[1] "1 lá ó shin"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 seachtain ó shin"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d seachtain ó shin"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 seachtain ó shin"
+msgstr[1] "1 seachtain ó shin"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 mí ó shin"
+msgid_plural "%d months ago"
+msgstr[0] "1 mí ó shin"
+msgstr[1] "1 mí ó shin"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d mí ó shin"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 bliain ó shin"
+msgid_plural "%d years ago"
+msgstr[0] "1 bliain ó shin"
+msgstr[1] "1 bliain ó shin"
 
-# FIXME : Grammar ? 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d bliain ó shin"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "anois"
 
 #. 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 ""
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
-msgstr ""
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Sábháil Mar"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Roghnaigh comhad"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr ""
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Am</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
@@ -11902,23 +11943,23 @@ msgstr ""
 
 # IR
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr ""
 
@@ -11926,48 +11967,57 @@ msgstr ""
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
+# vi
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
+msgstr "Ainm chomhaid:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Gan Tidéal"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Am</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr ""
+msgid "    "
+msgstr "      "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr ""
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Méarloirg</b>"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Foinse FFillteáin"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:5
@@ -11975,81 +12025,69 @@ msgid "Incoming"
 msgstr ""
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "soicind"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr ""
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr ""
-
 # el 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "seachtanna"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr ""
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "bliana"
 
@@ -12186,7 +12224,7 @@ msgid "Junk Test"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Lipéid"
@@ -12217,8 +12255,9 @@ msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr ""
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Éirigh as an ríomhchlár"
 
 # PL
 #: filter/libfilter-i18n.h:45
@@ -12253,22 +12292,23 @@ msgstr ""
 msgid "returns less than"
 msgstr ""
 
+#: filter/libfilter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Rith roghchlár"
+
 # Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Scór"
 
-#: filter/libfilter-i18n.h:54
-msgid "Sender"
-msgstr ""
-
 #: filter/libfilter-i18n.h:55
-msgid "Set Status"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Shell Command"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
@@ -12295,9 +12335,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Ábhar"
@@ -12307,17 +12347,13 @@ msgstr "Ábhar"
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr ""
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr ""
 
@@ -12330,8 +12366,8 @@ msgstr ""
 msgid "Rule name"
 msgstr ""
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+msgid "_Score Rules"
 msgstr ""
 
 #: filter/searchtypes.xml.h:1
@@ -12366,15 +12402,20 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "_Fillteán"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "Foinse FFillteáin"
 
@@ -12423,8 +12464,8 @@ msgstr "Amharcóir fillteáin phost Evolution"
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Post"
@@ -12433,53 +12474,50 @@ msgstr "Post"
 msgid "Mail Accounts"
 msgstr "Cuntasaí Phoist"
 
-#: 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 "Roghnachais Phoist"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Gnáth]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Ainm chuntas"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr ""
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr ""
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr ""
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "Suimigh Siniú"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr ""
 
@@ -12524,7 +12562,7 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
@@ -12556,396 +12594,429 @@ msgstr "(Scéal gan tideál)"
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Cruthaigh Fillteán Nua"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "FFilteáin"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Ag Lódáil..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Ag dealaigh fillteán %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr ""
+"Earraidh ag sábhháil scéalaí  do: %s\n"
+" %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+"Earraidh ag sábhháil scéalaí  do: %s\n"
+" %s"
+
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Ní féidir an fillteán a bhogadh: %s"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Teíp ag dealaigh fillteán: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr ""
 "Teip ag dealaigh fillteán:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dealaigh \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr ""
 "Teip ag athainmigh fillteán:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Feach"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Bog"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Athainmigh"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Roghanna..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "_Bog go Fillteán..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Gnáth"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
 msgid "Unsigned"
 msgstr "Gan Siniú"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
 # SG
-#: 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 "Siniú Bhailithe."
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
 # SG
-#: 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 "Siniú neambhailí."
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Feach Teastas"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr ""
 
@@ -12954,124 +13025,159 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Leathanach %d as %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 ""
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Ó"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: 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 "Do"
 
-#: 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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dáta"
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Sábháil siniú"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr ""
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Gach bliain"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Aon _seachtain"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Aon _mhí"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13080,22 +13186,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr ""
@@ -13135,58 +13241,58 @@ msgstr "_Suim do Leabhar Seoladh"
 msgid "Open in %s..."
 msgstr "Oscail san %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 ""
 
 # Avoid; either use KR or KP
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Fillteán"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Dé %a, %Y-%m-%d ag %H:%M %%+05d, scríobh %%s:"
 
-#: 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"
@@ -13195,42 +13301,42 @@ msgstr ""
 " Ní féidir sábháil go `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "scéal"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Suimigh seoladh"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Scéal ó %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13239,7 +13345,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13304,255 +13410,287 @@ msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Default reply style"
+msgid "Default height of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Default width of the Composer Window"
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Message Window"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Subscribe dialog"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
-msgid "Enable/disable caret mode"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:23
-msgid "Height of the message-list pane"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:24
-msgid "Height of the message-list pane."
+msgid "Enable/disable caret mode"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Líosta do cuntasaí"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Taispeán Beocháin"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13560,109 +13698,109 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr ""
 
@@ -13701,14 +13839,14 @@ msgstr ""
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Fán le do thoil"
 
@@ -13754,12 +13892,12 @@ msgstr "Comhad Inchur"
 msgid "Scanning %s"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:650
+#: mail/importers/netscape-importer.c:651
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13774,7 +13912,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13782,7 +13920,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13791,23 +13929,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Álbachtaí"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13837,60 +13975,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-# so
-#: 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 ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Óst:"
 
-#: 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 "Ainm _Úsaideoir:"
 
-#: 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 "_Slí:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -13923,11 +14029,11 @@ msgstr "Freagraí do %s"
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13935,82 +14041,83 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Fillteán Nua"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Fillteán"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cruthaigh féilire nua"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: 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 "
@@ -14019,123 +14126,240 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
 msgstr ""
 
+#: mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>Reamhthaispeáintas</b>"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Stádas:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "_Teanga:"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Eagarthóir Chuntas"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Eolas Cuntais"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
+msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:20
-msgid "Attach original message"
+msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Ceangaltán"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Údarú"
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltach (ISO-8859-13)"
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltach (ISO-8859-4)"
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Dathanna"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:27
-msgid "Check _Incoming Mail"
-msgstr "Post ríomhphost"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:28
-msgid "Check spelling while I _type"
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:30
-msgid "Checks incoming mail messages to be Junk"
+msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:31
-msgid "Color for _misspelled words:"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Ag Cruthach Scéaltaí"
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Socrú"
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Eagarthóir Chuntas"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Suimigh Siniú"
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "_Slándáil"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+msgid "Always _sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:44
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Ceangaltán"
+
+#: mail/mail-config.glade.h:46
+msgid "Automatically _insert smiley images"
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "Automatically check for _new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltach (ISO-8859-13)"
+
+#: mail/mail-config.glade.h:49
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltach (ISO-8859-4)"
+
+#: mail/mail-config.glade.h:50
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "C_haracter set:"
+msgstr ""
+
+#: mail/mail-config.glade.h:52
+msgid "Ch_eck for Supported Types "
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+msgid "Check _Incoming Mail"
+msgstr "Post ríomhphost"
+
+#: mail/mail-config.glade.h:54
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Dathanna"
+
+#: mail/mail-config.glade.h:58
+msgid "Confirm _when expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14145,493 +14369,405 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Gnáth"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Iompar Loicthe"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Ag Scrios Post"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr ""
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "Gnáth"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: 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 "Críochnaithe"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
-msgstr ""
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "_Fillteaín:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Cuntasaí Rphoist"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "_Seoladh R-phost:"
 
-#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+#: mail/mail-config.glade.h:77
+msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Álbachtaí Clófhoireann"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "Post _HTML"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "_Aimsir"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 # ie
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr ""
 
-#: 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 "Lipeideanna agus Dathanna"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Ag Lódáil íomhanna"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Áit do Bosca Phoist"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Scríobhóir Scéal"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Taispeántas Scéal"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Clófhoireanna Scéal"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr ""
-
-#: 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"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "_Eagrú:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Roghnaigh dath"
 
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
+#: mail/mail-config.glade.h:109
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "Priontáil an tadhallaí seo"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr ""
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "_Freagrair-Do"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr ""
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
+msgstr "Cumraigh do %s"
 
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr ""
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
+#: mail/mail-config.glade.h:120
+msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
 msgstr "_Slándáil"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME (S/MIME)"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-msgid "Sending Email"
-msgstr ""
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_Roghnaigh..."
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:127
+msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr ""
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
+msgstr "Roghnaigh Fillteán Tascanna"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "_Saghas Freastalaî: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+# SG
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Siniú:"
+
+# SG
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "Siniú:"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+msgid "T_erminal Font:"
+msgstr ""
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Saghas:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
 "dictionary installed."
 msgstr ""
 
-#: 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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Suimigh Siniú"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr ""
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "Saghas _Udarú :"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "Saghas _udarú :"
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr ""
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
+#: mail/mail-config.glade.h:157
+msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "Síniú _gnáth:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
+#: mail/mail-config.glade.h:158
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "Ainm _fhada:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "Post _HTML"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr ""
-
-# GN
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr ""
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-
-#: mail/mail-config.glade.h:167
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
-msgid "_Reply style:"
-msgstr ""
-
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr ""
-
 #: mail/mail-config.glade.h:171
-msgid "_Script:"
+msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Roghnaigh..."
-
 #: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Show animated images"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
-msgid "_Signatures"
+msgid "_Reply style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
+msgid "_Script:"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
+msgid "_Show animated images"
 msgstr ""
 
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "noimea(i)d"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "dath"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "sonraí"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Ag Obair"
 
@@ -14639,132 +14775,131 @@ msgstr "Ag Obair"
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:741
+#: mail/mail-ops.c:695
 #, c-format
-msgid "Failed on message %d of %d"
+msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Líosta do cuntasaí"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Fillteáin Áitiúl"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr ""
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Ag Sábháil %d scéal(aí)"
+msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Ag Sábháil %d scéal(aí)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Ag Sábháil %d scéal(aí)"
+msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14773,7 +14908,7 @@ msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14782,11 +14917,11 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14795,25 +14930,21 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -14826,109 +14957,104 @@ msgstr ""
 msgid "Find:"
 msgstr "Cuardaigh:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Cuardaigh"
-
-# SG
-#: mail/mail-security.glade.h:2
-msgid "Digital Signature"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr ""
 
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
+#: mail/mail-security.glade.h:2
+msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "Eolas Slándáil"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastalaí: %s, Saghas: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Slí: %s, Saghas: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Saghas: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Cealaigh _Gach Uile"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Teip ag sábháil comhad siniú: %s"
 
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Sábháil siniú"
 
 # SG
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Eagar síniú"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Ainm:"
 
@@ -14958,17 +15084,17 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr "Fillteán neambhailí: '%s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag socraigh ffilteán: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14977,84 +15103,84 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Eagar FFilteán"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Fillteán Nua"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: 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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr ""
 
@@ -15103,7 +15229,7 @@ msgid "For Your Information"
 msgstr ""
 
 # NO
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr ""
 
@@ -15111,11 +15237,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Freagrair do gach rud"
 
@@ -15138,7 +15264,7 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr ""
 
 #: mail/message-tags.glade.h:7
@@ -15338,7 +15464,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -15361,81 +15487,81 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
 msgstr "Earraidh ag lódáil %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Uathoibríoch"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Ainm Chomad:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Roghnaigh Comhad"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Saghas comhad:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "Ó %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr ""
 
@@ -15443,7 +15569,7 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Roghnachais Evolution"
 
@@ -15477,11 +15603,11 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15490,10 +15616,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr ""
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -15535,15 +15657,15 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr "Faoi Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr ""
 
@@ -15591,7 +15713,6 @@ msgstr ""
 
 #: 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 "Nua"
 
@@ -15640,15 +15761,16 @@ msgid "Create a new test item"
 msgstr "Cruthaigh tasc nua"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr ""
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>Tadhallaî</b>"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+msgid "Active Connections"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -15761,28 +15883,28 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15802,7 +15924,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15810,91 +15932,102 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr "Ainm Teastas"
 
-#: 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 ""
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "Seoladh R-Post:"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Amharcóir Teastas: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Pasfhocal do %s, le do thoil"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Pasfhocal do %s, le do thoil"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Pasfhocal, le do thoil"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16078,7 +16211,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr ""
 
@@ -16350,7 +16484,7 @@ msgstr "Bog Tadhall(aí) go Fillteán Eile"
 msgid "Move to Folder..."
 msgstr "Bog go Fillteán..."
 
-#: 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 "Greamaigh an ghearrthaisce"
 
@@ -16359,8 +16493,8 @@ msgid "Previews the contacts to be printed"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Priontáil reamh-taispeántas"
 
@@ -16409,13 +16543,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Gníomhartha"
 
@@ -16436,14 +16570,10 @@ msgid "_Save as VCard"
 msgstr "_Sábháil Mar VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Roghnaigh Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -16451,58 +16581,54 @@ msgstr ""
 msgid "Day"
 msgstr "Lá"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Scrios an coinne seo"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Scríos an Tarlú seo"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Scríos an tarlú seo"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Téir siar"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
+msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Liosta"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mí"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Aniar"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Siar"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Priontáil an féilire seo"
@@ -16511,7 +16637,7 @@ msgstr "Priontáil an féilire seo"
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr ""
 
@@ -16520,34 +16646,54 @@ msgid "Purge old appointments and meetings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Roghnaigh gach teacs"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Roghnaigh Comhad"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Roghnaigh fillteán"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Taispeán aon la"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Taispeáin aon mhí"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Taispeán aon seachtain"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Inniú"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Feach an coinne reatha"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Seachtain"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Oscail Coinne"
 
@@ -16812,7 +16958,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -16980,308 +17126,309 @@ msgid "F_orward As..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Filter on Mailing _List..."
+msgid "Filter _Junk"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Filter on Se_nder..."
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Filter on _Recipients..."
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Subject..."
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
-msgid "Flag selected message(s) for follow-up"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Post sceál do tadhall"
+
+#: ui/evolution-mail-message.xml.h:39
+msgid "Flag selected message(s) for follow-up"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Méadaigh an téacs"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Bog"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Aniar"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr ""
 
 # NL
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Siar"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Clodaigh scéal seo"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Cóip go Fillteán"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr ""
 
 # PE
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Bog go Fillteán"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "Taispeaín _Gnáth"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Oscail Scéal"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Uir_lisí"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Athdealaigh"
 
@@ -17548,39 +17695,39 @@ msgstr ""
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Taispeán tadhallaí roghnaithe"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Oscail Tasc"
 
@@ -17710,10 +17857,15 @@ msgid "_Day View"
 msgstr "Amharc _Lá"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Amharc Líosta"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Amharc_Mí"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Amharc Seachtain _Oibre"
 
@@ -17743,10 +17895,16 @@ msgid "_Messages"
 msgstr "_Scéalaí"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr ""
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Dáta Breithe"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "_Stádas:"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tascanna"
 
@@ -17802,14 +17960,10 @@ msgstr "LMCDASD"
 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 "Anois"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Inniú"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -17819,88 +17973,93 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltach"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Lár-Eorpach"
 
 # zh
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Sínis"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cirilleach"
 
 # el 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Gréigis"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Eabhrais"
 
 # ja
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Seapáinis"
 
 # ko
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Coiréis"
 
 # tr
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Tuircis"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Uincód"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "Lár-Eorpach"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr ""
 
 # uk
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Úcráinis"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Eile..."
 
@@ -17964,11 +18123,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "C_uardaigh"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr ""
 
@@ -17989,15 +18153,15 @@ msgstr "_Ardmód..."
 msgid "Choose Image"
 msgstr "Roghnaigh comhad"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "C_uardaigh"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Bánaigh"
 
@@ -18027,1094 +18191,1192 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Rinneadh)"
 
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Teip ag oscailt comhad '%s':\n"
-"%s"
+#~ msgid "2:30"
+#~ msgstr "2:30"
 
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Teip ag cruthaigh eolaire '%s':\n"
-"%s"
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Leabhar Seoladh..."
 
-msgid "    "
-msgstr "      "
+#~ msgid "1 contact"
+#~ msgstr "1 Tadhall"
 
-msgid "Cannot copy folder: %s"
-msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
+#~ msgid "and %d other contacts."
+#~ msgstr "agus %d tadhallaí eile."
 
-msgid "Copy Folder"
-msgstr "Cóip Fillteán"
+#~ msgid "1 day"
+#~ msgstr "1 lá"
 
-msgid "Move Folder"
-msgstr "Bog Fillteán"
+#~ msgid "1 week"
+#~ msgstr "1 seachtain"
 
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Teip ag scŕios fillteán:\n"
-"%s"
+#~ msgid "1 hour"
+#~ msgstr "1 uair"
 
-msgid "Group name:"
-msgstr "Ainm Grupa:"
+#~ msgid "1 minute"
+#~ msgstr "1 noiméad"
 
-msgid "_Add Group..."
-msgstr "_Cuir Grúpa Leis..."
+#~ msgid "1 second"
+#~ msgstr "1 soicind"
 
-msgid "_Remove this Group..."
-msgstr "_Scríos Grupa seo..."
+#~ msgid "Description"
+#~ msgstr "Tuarascail"
 
-msgid "Re_name this Group..."
-msgstr "_Athainmigh an Grupa seo..."
+#~ msgid "URL"
+#~ msgstr "URL"
 
-msgid "Create _Default Shortcuts"
-msgstr "Cruthaigh Aicearraí _Loicthe"
+#~ msgid "Every %d days"
+#~ msgstr "Gach %d lá"
 
-msgid "Create Default Shortcuts"
-msgstr "Cruthaigh Aicearraí Loicthe"
+#~ msgid "Every %d weeks"
+#~ msgstr "Gach %d seachtain"
 
-msgid "Rename Shortcut"
-msgstr "Athanimnigh Aicearra"
+#~ msgid "Every %d weeks on "
+#~ msgstr "Gach %d seachtain dé "
 
-msgid "Open in New _Window"
-msgstr "Oscail san _Fuinneog Nua"
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Ainm do Fhreastalaí"
 
-msgid "Rename this shortcut"
-msgstr "Athainmigh an iaicearra seo"
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "Cuardaigh"
 
-msgid "Re_move"
-msgstr "_Scríos"
+#~ msgid "%d seconds ago"
+#~ msgstr "%d soicind ó shin"
 
-msgid "Shortcuts"
-msgstr "Aicearraí"
+#~ msgid "%d minutes ago"
+#~ msgstr " %d noiméaid ó shin"
 
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" san \"%s\""
+#~ msgid "%d hours ago"
+#~ msgstr "%d (h)(n-)uaire ó shin"
 
-msgid "Print Summary"
-msgstr "Coimiriú Príont"
+#~ msgid "%d days ago"
+#~ msgstr "%d lá ó shin"
 
-# IS
-msgid "Reload"
-msgstr "Athlódáil"
+#~ msgid "%d weeks ago"
+#~ msgstr "%d seachtain ó shin"
 
-msgid "Copy to folder..."
-msgstr "Cóip do Fillteán..."
+#~ msgid "%d months ago"
+#~ msgstr "%d mí ó shin"
 
-msgid "Move to folder..."
-msgstr "Bog go fillteán..."
+# FIXME : Grammar ? 
+#~ msgid "%d years ago"
+#~ msgstr "%d bliain ó shin"
 
-msgid "Home Address"
-msgstr "Seoladh Bhaile"
+# so
+#~ msgid "maildir"
+#~ msgstr "maildir"
 
-msgid "Work Address"
-msgstr "Seoladh Obrithe"
+#~ msgid "mbox"
+#~ msgstr "mbox"
 
-msgid "Other Address"
-msgstr "Seoladh Eile"
+#~ msgid "mh"
+#~ msgstr "mh"
 
-msgid "Evolution Error"
-msgstr "Earráid Evolution"
+#~ msgid "Account Information"
+#~ msgstr "Eolas Cuntais"
 
-msgid "Error starting %s"
-msgstr "Earriadh ag tosnú %s"
+#~ msgid "Authentication"
+#~ msgstr "Údarú"
 
-msgid "Create New Shortcut"
-msgstr "Cruthaigh Aicearra Nua"
+#~ msgid "Composing Messages"
+#~ msgstr "Ag Cruthach Scéaltaí"
 
-# vi
-msgid "Rename"
-msgstr "Athainmnigh"
+#~ msgid "Configuration"
+#~ msgstr "Socrú"
 
-msgid "Edit LDAP Server"
-msgstr "Eagar Freastalaí LDAP"
+#~ msgid "Default Behavior"
+#~ msgstr "Iompar Loicthe"
 
-msgid "_Folder:"
-msgstr "_Fillteaín:"
+#~ msgid "Deleting Mail"
+#~ msgstr "Ag Scrios Post"
 
-# YU
-msgid "Yugoslavia"
-msgstr "An Iúglaiv"
+#~ msgid "Labels and Colors"
+#~ msgstr "Lipeideanna agus Dathanna"
 
-msgid "<b>Task List</b>"
-msgstr "<b>Líosta Tasc</b>"
+#~ msgid "Loading Images"
+#~ msgstr "Ag Lódáil íomhanna"
 
-msgid "<b>Time</b>"
-msgstr "<b>Am</b> "
+#~ msgid "Message Display"
+#~ msgstr "Taispeántas Scéal"
 
-msgid "<b>Work Week</b>"
-msgstr "<b>Seachtain Oibre</b>"
+#~ msgid "Message Fonts"
+#~ msgstr "Clófhoireanna Scéal"
 
-msgid "<b>Date &amp; Time</b>"
-msgstr "<b>Data &amp; Am</b>"
+#~ msgid "Printed Fonts"
+#~ msgstr "Priontáil an tadhallaí seo"
 
-msgid "<b>Description</b>"
-msgstr "<b>Tuarascail</b>"
+#~ msgid "S_ecurity"
+#~ msgstr "_Slándáil"
 
-msgid "<b>L_ocation</b>"
-msgstr "<b>_Áit</b>"
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Secure MIME (S/MIME)"
 
-msgid "<b>Su_mmary</b>"
-msgstr "<b>Coimriú</b>"
+#~ msgid "_Authentication Type: "
+#~ msgstr "Saghas _Udarú :"
 
-msgid "<b>Preview</b>"
-msgstr "<b>Reamhthaispeáintas</b>"
+#~ msgid "_Authentication type: "
+#~ msgstr "Saghas _udarú :"
 
-msgid "<b>Web Page</b>"
-msgstr "<b>Leathanach Lín</b>"
+#~ msgid "_Default signature:"
+#~ msgstr "Síniú _gnáth:"
 
-msgid "Adding %s"
-msgstr "Ag Suimigh %s"
+#~ msgid "_Full name:"
+#~ msgstr "Ainm _fhada:"
 
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Teip ag cruthaigh eolaire\n"
-"%s\n"
-"Earraidh: %s"
+#~ msgid "Search"
+#~ msgstr "Cuardaigh"
 
-msgid "Select Calendar Folder"
-msgstr "Roghnaigh Fillteán Fhéilire"
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Teip ag oscailt comhad '%s':\n"
+#~ "%s"
 
-msgid "Select Tasks Folder"
-msgstr "Roghnaigh Fillteán Tascanna"
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Teip ag cruthaigh eolaire '%s':\n"
+#~ "%s"
 
-msgid "Folder Settings"
-msgstr "Albachtaí Fillteáin"
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
 
-msgid "New _Calendar"
-msgstr "_Féilire Nua"
+#~ msgid "Copy Folder"
+#~ msgstr "Cóip Fillteán"
 
-msgid "Primary"
-msgstr "Tosaíocht"
+#~ msgid "Move Folder"
+#~ msgstr "Bog Fillteán"
 
-msgid "Prim"
-msgstr "Tos."
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Teip ag scŕios fillteán:\n"
+#~ "%s"
 
-msgid "Bus"
-msgstr "Gnó"
+#~ msgid "Group name:"
+#~ msgstr "Ainm Grupa:"
 
-msgid "Company"
-msgstr "Teoranta"
+#~ msgid "_Add Group..."
+#~ msgstr "_Cuir Grúpa Leis..."
 
-msgid "Comp"
-msgstr "Teor."
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Scríos Grupa seo..."
 
-msgid "Org"
-msgstr "Eag."
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Athainmigh an Grupa seo..."
 
-msgid "Mobile"
-msgstr "Guthán Póca"
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Cruthaigh Aicearraí _Loicthe"
 
-msgid "Car"
-msgstr "Car"
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Cruthaigh Aicearraí Loicthe"
 
-msgid "Bus Fax"
-msgstr "Facs Ghnó"
+#~ msgid "Rename Shortcut"
+#~ msgstr "Athanimnigh Aicearra"
 
-msgid "Business 2"
-msgstr "Gnó 2"
+#~ msgid "Open in New _Window"
+#~ msgstr "Oscail san _Fuinneog Nua"
 
-msgid "Bus 2"
-msgstr "Gnó 2"
+#~ msgid "Rename this shortcut"
+#~ msgstr "Athainmigh an iaicearra seo"
 
-msgid "Home 2"
-msgstr "Baile 2"
+#~ msgid "Re_move"
+#~ msgstr "_Scríos"
 
-msgid "ISDN"
-msgstr "ISDN"
+#~ msgid "Shortcuts"
+#~ msgstr "Aicearraí"
 
-msgid "TTY"
-msgstr "TTY"
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" san \"%s\""
 
-msgid "Url"
-msgstr "Url"
+#~ msgid "Print Summary"
+#~ msgstr "Coimiriú Príont"
 
-msgid "Department"
-msgstr "Roinn"
+# IS
+#~ msgid "Reload"
+#~ msgstr "Athlódáil"
 
-msgid "Dep"
-msgstr "Ran."
+#~ msgid "Copy to folder..."
+#~ msgstr "Cóip do Fillteán..."
 
-msgid "Off"
-msgstr "Oif."
+#~ msgid "Move to folder..."
+#~ msgstr "Bog go fillteán..."
 
-msgid "Prof"
-msgstr "Dea."
+#~ msgid "Home Address"
+#~ msgstr "Seoladh Bhaile"
 
-msgid "Man"
-msgstr "Bain."
+#~ msgid "Work Address"
+#~ msgstr "Seoladh Obrithe"
 
-msgid "Ass"
-msgstr "Cnt."
+#~ msgid "Other Address"
+#~ msgstr "Seoladh Eile"
 
-msgid "Nick"
-msgstr "L.ainm."
+#~ msgid "Evolution Error"
+#~ msgstr "Earráid Evolution"
 
-msgid "Calendar URI"
-msgstr "Féilire URI"
+#~ msgid "Error starting %s"
+#~ msgstr "Earriadh ag tosnú %s"
 
-msgid "CALUri"
-msgstr "CALUri"
+#~ msgid "Create New Shortcut"
+#~ msgstr "Cruthaigh Aicearra Nua"
 
-msgid "FBUrl"
-msgstr "FBUrl"
+# vi
+#~ msgid "Rename"
+#~ msgstr "Athainmnigh"
 
-msgid "Default server calendar"
-msgstr "Féilire freastalaí loicthe"
+#~ msgid "Edit LDAP Server"
+#~ msgstr "Eagar Freastalaí LDAP"
 
-msgid "icsCalendar"
-msgstr "icsFéilire"
+# YU
+#~ msgid "Yugoslavia"
+#~ msgstr "An Iúglaiv"
 
-msgid "Birth Date"
-msgstr "Dáta Breithe"
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Líosta Tasc</b>"
 
-msgid "ECard"
-msgstr "RCarta"
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Seachtain Oibre</b>"
 
-msgid "%x"
-msgstr "%x"
+#~ msgid "<b>Date &amp; Time</b>"
+#~ msgstr "<b>Data &amp; Am</b>"
 
-msgid "Address Label"
-msgstr "Lipéad Sheoladh"
+#~ msgid "<b>Description</b>"
+#~ msgstr "<b>Tuarascail</b>"
 
-msgid "Birth date"
-msgstr "Dáta Breithe"
+#~ msgid "<b>L_ocation</b>"
+#~ msgstr "<b>_Áit</b>"
 
-msgid "ICS Calendar"
-msgstr "Féilire ICS"
+#~ msgid "<b>Su_mmary</b>"
+#~ msgstr "<b>Coimriú</b>"
 
-msgid "Category List"
-msgstr "Liosta Catagóire"
+#~ msgid "<b>Web Page</b>"
+#~ msgstr "<b>Leathanach Lín</b>"
 
-msgid "Arbitrary"
-msgstr "Ar Togradh"
+#~ msgid "Adding %s"
+#~ msgstr "Ag Suimigh %s"
 
-msgid "Searching..."
-msgstr "Ag Cuardaigh..."
+#~ msgid ""
+#~ "Cannot create the directory\n"
+#~ "%s\n"
+#~ "Error: %s"
+#~ msgstr ""
+#~ "Teip ag cruthaigh eolaire\n"
+#~ "%s\n"
+#~ "Earraidh: %s"
 
-msgid "Using Email Address"
-msgstr "Le Seoladh Rpost:"
+#~ msgid "Select Calendar Folder"
+#~ msgstr "Roghnaigh Fillteán Fhéilire"
 
-msgid "Public Contacts"
-msgstr "Tadhallaí Phoiblí"
+#~ msgid "Folder Settings"
+#~ msgstr "Albachtaí Fillteáin"
 
-msgid "Other Contacts"
-msgstr "Tadhallaí Eile"
+#~ msgid "New _Calendar"
+#~ msgstr "_Féilire Nua"
 
-msgid "Card"
-msgstr "Carta"
+#~ msgid "Primary"
+#~ msgstr "Tosaíocht"
 
-msgid "Is New Card"
-msgstr "Is Carta Nua"
+#~ msgid "Prim"
+#~ msgstr "Tos."
 
-msgid "No cards"
-msgstr "Gan cartaí"
+#~ msgid "Bus"
+#~ msgstr "Gnó"
 
-msgid "1 card"
-msgstr "1 carta"
+#~ msgid "Company"
+#~ msgstr "Teoranta"
 
-# FIXME : Grammar ? 
-msgid "%d cards"
-msgstr "%d cartaí"
+#~ msgid "Comp"
+#~ msgstr "Teor."
 
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
+#~ msgid "Org"
+#~ msgstr "Eag."
 
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgid "Mobile"
+#~ msgstr "Guthán Póca"
 
-msgid "Business Address"
-msgstr "Seoladh Ghnó"
+#~ msgid "Car"
+#~ msgstr "Car"
 
-msgid "Print cards"
-msgstr "Priontáil Cartaí"
+#~ msgid "Bus Fax"
+#~ msgstr "Facs Ghnó"
 
-msgid "Print card"
-msgstr "Priontáil carta"
+#~ msgid "Business 2"
+#~ msgstr "Gnó 2"
 
-msgid "Public Calendar"
-msgstr "Féilire Poiblí"
+#~ msgid "Bus 2"
+#~ msgstr "Gnó 2"
 
-msgid "Public Tasks"
-msgstr "Tascanna Poiblí"
+#~ msgid "Home 2"
+#~ msgstr "Baile 2"
 
-msgid "_Save as..."
-msgstr "_Sábháil mar..."
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
 
-msgid "New _Appointment"
-msgstr "_Coinne Nua"
+#~ msgid "TTY"
+#~ msgstr "TTY"
 
-msgid "Print..."
-msgstr "Clódáil..."
+#~ msgid "Url"
+#~ msgstr "Url"
 
-msgid "Opening calendar at %s"
-msgstr "Ag oscailt féilire as %s"
+#~ msgid "Department"
+#~ msgstr "Roinn"
 
-msgid "Properties for \"%s\""
-msgstr "Albachtaí do \"%s\""
+#~ msgid "Dep"
+#~ msgstr "Ran."
 
-msgid "%d new"
-msgstr "%d nua"
+#~ msgid "Off"
+#~ msgstr "Oif."
 
-msgid ", "
-msgstr ", "
+#~ msgid "Prof"
+#~ msgstr "Dea."
 
-msgid "%d total"
-msgstr "%d íomlán"
+#~ msgid "Man"
+#~ msgstr "Bain."
 
-msgid "Send anyway?"
-msgstr "Post ar aon nós?"
+#~ msgid "Ass"
+#~ msgstr "Cnt."
 
-msgid "Save Messages As..."
-msgstr "Sábháil Scéala Mar..."
+#~ msgid "Nick"
+#~ msgstr "L.ainm."
 
-msgid "Save Image as..."
-msgstr "Sábháil Iomha le..."
+#~ msgid "Calendar URI"
+#~ msgstr "Féilire URI"
 
-msgid "Bad Address"
-msgstr "Droch Seoladh"
+#~ msgid "CALUri"
+#~ msgstr "CALUri"
 
-msgid "Local folders/%s"
-msgstr "Fillteán áitiiúl/%s"
+#~ msgid "FBUrl"
+#~ msgstr "FBUrl"
 
-msgid "Empty Message"
-msgstr "Scéal Fólamh"
+#~ msgid "Default server calendar"
+#~ msgstr "Féilire freastalaí loicthe"
 
-msgid "(No subject)"
-msgstr "(Gan ábhar)"
+#~ msgid "icsCalendar"
+#~ msgstr "icsFéilire"
 
-msgid "%s - Message"
-msgstr "%s - Scéal"
+#~ msgid "ECard"
+#~ msgstr "RCarta"
 
-msgid "Evolution Summary"
-msgstr "Coimriú Evolution"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-msgid "Summary Preferences"
-msgstr "Roghnachais Choimriú"
+#~ msgid "Address Label"
+#~ msgstr "Lipéad Sheoladh"
 
-msgid "Africa"
-msgstr "An Afraic"
+#~ msgid "ICS Calendar"
+#~ msgstr "Féilire ICS"
 
-# AQ
-msgid "Antartica"
-msgstr "an tAntartach"
+#~ msgid "Category List"
+#~ msgstr "Liosta Catagóire"
 
-# AT
-msgid "Asia"
-msgstr "An Áise"
+#~ msgid "Arbitrary"
+#~ msgstr "Ar Togradh"
 
-# AQ
-msgid "Atlantic"
-msgstr "Atlantach"
+#~ msgid "Searching..."
+#~ msgstr "Ag Cuardaigh..."
 
-# CM
-msgid "Cameron"
-msgstr "Camarún"
+#~ msgid "Using Email Address"
+#~ msgstr "Le Seoladh Rpost:"
 
-msgid "Dublin"
-msgstr "Baile Átha Cliath"
+#~ msgid "Public Contacts"
+#~ msgstr "Tadhallaí Phoiblí"
 
-# SV
-msgid "El Salvador Int."
-msgstr "An tSalvadóir Idirn."
+#~ msgid "Other Contacts"
+#~ msgstr "Tadhallaí Eile"
 
-msgid "Leuchars"
-msgstr "bliana"
+#~ msgid "Card"
+#~ msgstr "Carta"
 
-msgid "Middle East"
-msgstr "An Meánoirthear"
+#~ msgid "Is New Card"
+#~ msgstr "Is Carta Nua"
 
-msgid "Russia"
-msgstr "Rúisis"
+#~ msgid "No cards"
+#~ msgstr "Gan cartaí"
 
-msgid "United Arab Emirates "
-msgstr "Aontas na nÉimíríochtaí Arabacha"
+# FIXME : Grammar ? 
+#~ msgid "%d cards"
+#~ msgstr "%d cartaí"
 
-msgid "Wien"
-msgstr "Vín"
+#~ msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 
-msgid "Appointments"
-msgstr "Coinní"
+#~ msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
+#~ msgid "Business Address"
+#~ msgstr "Seoladh Ghnó"
 
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M%p %d %B"
+#~ msgid "Print cards"
+#~ msgstr "Priontáil Cartaí"
 
-msgid "Mail summary"
-msgstr "Coimriú phoist"
+#~ msgid "Print card"
+#~ msgstr "Priontáil carta"
 
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Focal do Lae"
+#~ msgid "Public Calendar"
+#~ msgstr "Féilire Poiblí"
 
-msgid "New News Feed"
-msgstr "Bealach Nuachtáin Nua"
+#~ msgid "Public Tasks"
+#~ msgstr "Tascanna Poiblí"
 
-msgid "_URL:"
-msgstr "_URL:"
+#~ msgid "_Save as..."
+#~ msgstr "_Sábháil mar..."
 
-msgid "News Feed"
-msgstr "Foth Nuachtáin"
+#~ msgid "New _Appointment"
+#~ msgstr "_Coinne Nua"
 
-msgid "All"
-msgstr "Gach Uile"
+#~ msgid "Print..."
+#~ msgstr "Clódáil..."
 
-msgid "No tasks"
-msgstr "Gan Tascanna"
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Ag oscailt féilire as %s"
 
-msgid "blue"
-msgstr "gorm"
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Albachtaí do \"%s\""
 
-msgid "(No Description)"
-msgstr "(Gan Tuarascail)"
+#~ msgid "%d new"
+#~ msgstr "%d nua"
 
-msgid "My Weather"
-msgstr "Aimsir"
+#~ msgid ", "
+#~ msgstr ", "
 
-msgid "Weather"
-msgstr "Aimsir"
+#~ msgid "%d total"
+#~ msgstr "%d íomlán"
 
-msgid "KBOS"
-msgstr "KBOS"
+#~ msgid "Send anyway?"
+#~ msgstr "Post ar aon nós?"
 
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
+#~ msgid "Save Messages As..."
+#~ msgstr "Sábháil Scéala Mar..."
 
-msgid "Please wait..."
-msgstr "Fán le do thoil..."
+#~ msgid "Save Image as..."
+#~ msgstr "Sábháil Iomha le..."
 
-msgid " F"
-msgstr " F"
+#~ msgid "Bad Address"
+#~ msgstr "Droch Seoladh"
 
-msgid "kph"
-msgstr "kph"
+#~ msgid "Local folders/%s"
+#~ msgstr "Fillteán áitiiúl/%s"
 
-msgid "inHg"
-msgstr "inHg"
+#~ msgid "Empty Message"
+#~ msgstr "Scéal Fólamh"
 
-msgid "mmHg"
-msgstr "mmHg"
+#~ msgid "(No subject)"
+#~ msgstr "(Gan ábhar)"
 
-msgid "miles"
-msgstr "míle"
+#~ msgid "%s - Message"
+#~ msgstr "%s - Scéal"
 
-msgid "kilometers"
-msgstr "km"
+#~ msgid "Summary Preferences"
+#~ msgstr "Roghnachais Choimriú"
 
-msgid "Scattered clouds"
-msgstr "Scamaill Scaipthe"
+#~ msgid "Africa"
+#~ msgstr "An Afraic"
 
-msgid "Few clouds"
-msgstr "Beagán Scamallach"
+# AQ
+#~ msgid "Antartica"
+#~ msgstr "an tAntartach"
 
-msgid "Overcast"
-msgstr "Dorcha"
+# AT
+#~ msgid "Asia"
+#~ msgstr "An Áise"
 
-msgid "Variable"
-msgstr "Luaineach"
+# AQ
+#~ msgid "Atlantic"
+#~ msgstr "Atlantach"
 
-msgid "North"
-msgstr "Tuaisceart"
+# CM
+#~ msgid "Cameron"
+#~ msgstr "Camarún"
 
-msgid "South"
-msgstr "Deisceart"
+#~ msgid "Dublin"
+#~ msgstr "Baile Átha Cliath"
 
-msgid "Rain"
-msgstr "Báisteach"
+# SV
+#~ msgid "El Salvador Int."
+#~ msgstr "An tSalvadóir Idirn."
 
-msgid "Snow"
-msgstr "Sneachta"
+#~ msgid "Leuchars"
+#~ msgstr "bliana"
 
-msgid "C_elsius"
-msgstr "C_elsius"
+#~ msgid "Middle East"
+#~ msgstr "An Meánoirthear"
 
-msgid "News Feeds"
-msgstr "Fotha Nuachtain"
+#~ msgid "Russia"
+#~ msgstr "Rúisis"
 
-msgid "One mont_h"
-msgstr "Aon _mhí"
+#~ msgid "United Arab Emirates "
+#~ msgstr "Aontas na nÉimíríochtaí Arabacha"
 
-msgid "One w_eek"
-msgstr "Aon _seachtain"
+#~ msgid "Wien"
+#~ msgstr "Vín"
 
-msgid "Show _all tasks"
-msgstr "Taispeán gach tascanna"
+#~ msgid "Appointments"
+#~ msgstr "Coinní"
 
-msgid "Show temperatures in:"
-msgstr "Taispeán teocht as:"
+#~ msgid "%k:%M %d %B"
+#~ msgstr "%k:%M %d %B"
 
-msgid "Weather Settings"
-msgstr "Albachtaí Aimsir"
+#~ msgid "%l:%M%p %d %B"
+#~ msgstr "%l:%M%p %d %B"
 
-msgid "_Delete Feed"
-msgstr "_Scrios Fotha"
+#~ msgid "Mail summary"
+#~ msgstr "Coimriú phoist"
 
-msgid "_Five days"
-msgstr "_Cúig lá"
+#~ msgid "Dictionary.com Word of the Day"
+#~ msgstr "Dictionary.com Focal do Lae"
 
-msgid "_New Feed"
-msgstr "Foth _Nua"
+#~ msgid "New News Feed"
+#~ msgstr "Bealach Nuachtáin Nua"
 
-msgid "Add a Folder"
-msgstr "Cuir Fillteán Leis"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-msgid "Outbox"
-msgstr "Asbosca"
+#~ msgid "News Feed"
+#~ msgstr "Foth Nuachtáin"
 
-msgid "Syncing Folder"
-msgstr "ag Ssioncronaich Fillteán"
+#~ msgid "All"
+#~ msgstr "Gach Uile"
 
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#~ msgid "No tasks"
+#~ msgstr "Gan Tascanna"
 
-msgid "(None)"
-msgstr "(Ar Bith)"
+#~ msgid "blue"
+#~ msgstr "gorm"
 
-msgid "No error"
-msgstr "Gan Earraidh"
+#~ msgid "(No Description)"
+#~ msgstr "(Gan Tuarascail)"
 
-msgid "I/O error"
-msgstr "Earraidh I/A"
+#~ msgid "My Weather"
+#~ msgstr "Aimsir"
 
-msgid "CORBA error"
-msgstr "Earraidh CORBA"
+#~ msgid "Weather"
+#~ msgstr "Aimsir"
 
-msgid "No owner"
-msgstr "Gan Úinéar"
+#~ msgid "KBOS"
+#~ msgstr "KBOS"
 
-msgid "Has subfolders"
-msgstr "Post an sceál seo"
+#~ msgid "%A, %B %e %Y"
+#~ msgstr "%A, %B %e %Y"
 
-msgid "Copy this folder"
-msgstr "_Fillteán"
+#~ msgid "Please wait..."
+#~ msgstr "Fán le do thoil..."
 
-msgid "Create a new shortcut"
-msgstr "Cruthaigh aicearra nua"
+#~ msgid " F"
+#~ msgstr " F"
 
-msgid "Evolution _Window"
-msgstr "_Fuinneog Evolution"
+#~ msgid "kph"
+#~ msgstr "kph"
 
-msgid "Open this folder in an other window"
-msgstr "Post an sceál seo"
+#~ msgid "inHg"
+#~ msgstr "inHg"
 
-msgid "_Copy..."
-msgstr "_Cóip..."
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
 
-msgid "_Folder..."
-msgstr "_Fillteán..."
+#~ msgid "miles"
+#~ msgstr "míle"
 
-msgid "_Move..."
-msgstr "_Bog..."
+#~ msgid "kilometers"
+#~ msgstr "km"
 
-msgid "_New Folder"
-msgstr "Fillteán _Nua"
+#~ msgid "Scattered clouds"
+#~ msgstr "Scamaill Scaipthe"
 
-msgid "Information"
-msgstr "Eolas"
+#~ msgid "Few clouds"
+#~ msgstr "Beagán Scamallach"
 
-msgid "Error"
-msgstr "Earraidh"
+#~ msgid "Overcast"
+#~ msgstr "Dorcha"
 
-msgid "Clear"
-msgstr "Bánaigh"
+#~ msgid "Variable"
+#~ msgstr "Luaineach"
 
-msgid "De_lete"
-msgstr "_Dealaigh"
+#~ msgid "North"
+#~ msgstr "Tuaisceart"
 
-msgid "Font Preferences"
-msgstr "Roghnachais Chlôfireann"
+#~ msgid "South"
+#~ msgstr "Deisceart"
 
-msgid "Emacs"
-msgstr "Emacs"
+#~ msgid "Rain"
+#~ msgstr "Báisteach"
 
-msgid "Delete news feed"
-msgstr "Dealaigh fotha nuachtan"
+#~ msgid "Snow"
+#~ msgstr "Sneachta"
 
-msgid "_Mail"
-msgstr "_Post"
+#~ msgid "C_elsius"
+#~ msgstr "C_elsius"
 
-msgid "_every"
-msgstr "_gach"
+#~ msgid "News Feeds"
+#~ msgstr "Fotha Nuachtain"
 
-msgid "_Clear Flag"
-msgstr "_Bánaigh Bratach"
+#~ msgid "Show _all tasks"
+#~ msgstr "Taispeán gach tascanna"
 
-msgid "S_elect server: "
-msgstr "_Roghnaigh freastalaí: "
+#~ msgid "Show temperatures in:"
+#~ msgstr "Taispeán teocht as:"
 
-msgid "Add"
-msgstr "Suimigh"
+#~ msgid "Weather Settings"
+#~ msgstr "Albachtaí Aimsir"
 
-# SG
-msgid "_Signature editor"
-msgstr "Eagarthóir Siniú"
+#~ msgid "_Delete Feed"
+#~ msgstr "_Scrios Fotha"
 
-msgid "Create _New Folder..."
-msgstr "Cruthaigh Fillteán _Nua..."
+#~ msgid "_Five days"
+#~ msgstr "_Cúig lá"
 
-msgid "_Contacts..."
-msgstr "_Tadhallaí..."
+#~ msgid "_New Feed"
+#~ msgstr "Foth _Nua"
 
-msgid "1234"
-msgstr "1234"
+#~ msgid "Add a Folder"
+#~ msgstr "Cuir Fillteán Leis"
 
-msgid "<- _Remove"
-msgstr "<- _Scríos"
+#~ msgid "Outbox"
+#~ msgstr "Asbosca"
 
-msgid "C_ontacts..."
-msgstr "_Tadhallaí..."
+#~ msgid "Syncing Folder"
+#~ msgstr "ag Ssioncronaich Fillteán"
 
-msgid "Phone Types"
-msgstr "Saghais Guthán"
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
 
-msgid "Delete Contact?"
-msgstr "Dealaigh Tadhall?"
+#~ msgid "(None)"
+#~ msgstr "(Ar Bith)"
 
-msgid "Display Cards?"
-msgstr "Taispeán Cartaí?"
+#~ msgid "No error"
+#~ msgstr "Gan Earraidh"
 
-msgid "Display Cards"
-msgstr "Taispeán Cartaí"
+#~ msgid "I/O error"
+#~ msgstr "Earraidh I/A"
 
-msgid "rd"
-msgstr "r"
+#~ msgid "CORBA error"
+#~ msgstr "Earraidh CORBA"
 
-msgid "Print Calendar"
-msgstr "Priontáil Féilre"
+#~ msgid "No owner"
+#~ msgstr "Gan Úinéar"
 
-msgid "Warning!"
-msgstr "Rabhadh!"
+#~ msgid "Has subfolders"
+#~ msgstr "Post an sceál seo"
 
-msgid "hour"
-msgstr "uair"
+#~ msgid "Copy this folder"
+#~ msgstr "_Fillteán"
 
-msgid "week"
-msgstr "seachtain"
+#~ msgid "Create a new shortcut"
+#~ msgstr "Cruthaigh aicearra nua"
 
-msgid "year"
-msgstr "bliain"
+#~ msgid "Evolution _Window"
+#~ msgstr "_Fuinneog Evolution"
 
-msgid "Add Signature"
-msgstr "Suimigh Siniú"
+#~ msgid "Open this folder in an other window"
+#~ msgstr "Post an sceál seo"
 
-msgid "Account %d"
-msgstr "Cuntas %d"
+#~ msgid "_Copy..."
+#~ msgstr "_Cóip..."
 
-msgid "All folders"
-msgstr "Gach fillteáin"
+#~ msgid "_Folder..."
+#~ msgstr "_Fillteán..."
 
-msgid "Apri file"
-msgstr "Comhad 'Apri'"
+#~ msgid "_Move..."
+#~ msgstr "_Bog..."
 
-msgid "Salve file"
-msgstr "Comhad 'Salve'"
+#~ msgid "_New Folder"
+#~ msgstr "Fillteán _Nua"
 
-msgid "New..."
-msgstr "Nua..."
+#~ msgid "Information"
+#~ msgstr "Eolas"
 
-msgid "Host"
-msgstr "Óst"
+#~ msgid "Error"
+#~ msgstr "Earraidh"
 
-msgid "Output File"
-msgstr "Comhad Aschur"
+#~ msgid "Clear"
+#~ msgstr "Bánaigh"
 
-msgid "_Configure..."
-msgstr "_Socraigh..."
+#~ msgid "De_lete"
+#~ msgstr "_Dealaigh"
 
-msgid "_Configure Pilot..."
-msgstr "_Socraigh Pilot..."
+#~ msgid "Font Preferences"
+#~ msgstr "Roghnachais Chlôfireann"
 
-msgid " "
-msgstr " "
+#~ msgid "Emacs"
+#~ msgstr "Emacs"
 
-# FIXME SP?
-msgid "Select PGP program"
-msgstr "Roghnaigh Ríomhchlár PGP"
+#~ msgid "Delete news feed"
+#~ msgstr "Dealaigh fotha nuachtan"
 
-# SG
-msgid "Signature #1"
-msgstr "Síniú #1"
+#~ msgid "_Mail"
+#~ msgstr "_Post"
+
+#~ msgid "_every"
+#~ msgstr "_gach"
+
+#~ msgid "_Clear Flag"
+#~ msgstr "_Bánaigh Bratach"
+
+#~ msgid "S_elect server: "
+#~ msgstr "_Roghnaigh freastalaí: "
+
+#~ msgid "Add"
+#~ msgstr "Suimigh"
 
 # SG
-msgid "Signature #2"
-msgstr "Síniú #2"
+#~ msgid "_Signature editor"
+#~ msgstr "Eagarthóir Siniú"
 
-msgid "&lt;- _Remove"
-msgstr "&lt;- _Scríos"
+#~ msgid "Create _New Folder..."
+#~ msgstr "Cruthaigh Fillteán _Nua..."
 
-msgid "_Add -&gt;"
-msgstr "_Suimigh -&gt;"
+#~ msgid "_Contacts..."
+#~ msgstr "_Tadhallaí..."
 
-msgid "1 byte"
-msgstr "1 byte"
+#~ msgid "1234"
+#~ msgstr "1234"
 
-msgid "%u bytes"
-msgstr "%u bytanna"
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Scríos"
 
-msgid "_Preferences..."
-msgstr "_Roghnachais..."
+#~ msgid "C_ontacts..."
+#~ msgstr "_Tadhallaí..."
 
-msgid "_Browse..."
-msgstr "_Brábhsáil..."
+#~ msgid "Phone Types"
+#~ msgstr "Saghais Guthán"
 
-msgid "I/O Error: %s"
-msgstr "Earraidh I/A: %s"
+#~ msgid "Delete Contact?"
+#~ msgstr "Dealaigh Tadhall?"
 
-msgid "NNTP Server:"
-msgstr "Freastalaî NNTP:"
+#~ msgid "Display Cards?"
+#~ msgstr "Taispeán Cartaí?"
 
-msgid "View messages..."
-msgstr "Feach scéalaí..."
+#~ msgid "Display Cards"
+#~ msgstr "Taispeán Cartaí"
 
-msgid "_Pilot Settings..."
-msgstr "_Álbachtaí Pilot..."
+#~ msgid "rd"
+#~ msgstr "r"
 
-msgid "_End of day:"
-msgstr "_Deireadh an Lá"
+#~ msgid "Print Calendar"
+#~ msgstr "Priontáil Féilre"
 
-msgid "%s server %s"
-msgstr "%s freastalaí %s"
+#~ msgid "Warning!"
+#~ msgstr "Rabhadh!"
 
-msgid "(unknown host)"
-msgstr "(óst gan fhois)"
+#~ msgid "hour"
+#~ msgstr "uair"
 
-msgid "No such message: %s"
-msgstr "Ni raibh scéal sinn: %s"
+#~ msgid "week"
+#~ msgstr "seachtain"
 
-msgid " Edit "
-msgstr "Eagar "
+#~ msgid "year"
+#~ msgstr "bliain"
 
-msgid "_Language:"
-msgstr "_Teanga:"
+#~ msgid "Account %d"
+#~ msgstr "Cuntas %d"
 
-msgid "Signature name:"
-msgstr "Ainm Siniú:"
+#~ msgid "All folders"
+#~ msgstr "Gach fillteáin"
 
-msgid "_Other"
-msgstr "_Eile"
+#~ msgid "Apri file"
+#~ msgstr "Comhad 'Apri'"
 
-msgid "Run %s"
-msgstr "Rith %s"
+#~ msgid "Salve file"
+#~ msgstr "Comhad 'Salve'"
 
-msgid "Close %s"
-msgstr "Dún %s"
+#~ msgid "New..."
+#~ msgstr "Nua..."
 
-msgid "page"
-msgstr "leathanach"
+#~ msgid "Host"
+#~ msgstr "Óst"
 
-msgid "RDF Summary"
-msgstr "Coimriú RDF"
+#~ msgid "Output File"
+#~ msgstr "Comhad Aschur"
 
-msgid "Mailbox Format"
-msgstr "Formóid Boscaphoist"
+#~ msgid "_Configure..."
+#~ msgstr "_Socraigh..."
 
-msgid "%s: Inbox"
-msgstr "%s: Inbosca"
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Socraigh Pilot..."
 
-msgid "Display"
-msgstr "Taispeán"
+#~ msgid " "
+#~ msgstr " "
 
-msgid "Edit..."
-msgstr "Eagar..."
+# FIXME SP?
+#~ msgid "Select PGP program"
+#~ msgstr "Roghnaigh Ríomhchlár PGP"
 
-msgid "News"
-msgstr "Nuacht"
+# SG
+#~ msgid "Signature #1"
+#~ msgstr "Síniú #1"
 
-msgid "_Organization:"
-msgstr "_Buidheann"
+# SG
+#~ msgid "Signature #2"
+#~ msgstr "Síniú #2"
 
-msgid "_Server type: "
-msgstr "Saghas _Freastalaí: "
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- _Scríos"
 
-msgid "seconds."
-msgstr "soicind."
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Suimigh -&gt;"
 
-msgid "Mail Summary"
-msgstr "Coimriú Nua"
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
 
-msgid "(No name)"
-msgstr "(gan ainm)"
+#~ msgid "%u bytes"
+#~ msgstr "%u bytanna"
 
-msgid "Create a _New Meeting"
-msgstr "Cruthaigh Cruinniú _Nua"
+#~ msgid "_Preferences..."
+#~ msgstr "_Roghnachais..."
 
-msgid "New Appointment"
-msgstr "Coinne Nua"
+#~ msgid "_Browse..."
+#~ msgstr "_Brábhsáil..."
 
-msgid "_Appointment..."
-msgstr "_Coinne..."
+#~ msgid "I/O Error: %s"
+#~ msgstr "Earraidh I/A: %s"
 
-msgid "_Calendar Settings..."
-msgstr "Álbachtaí _Féilire..."
+#~ msgid "NNTP Server:"
+#~ msgstr "Freastalaî NNTP:"
 
-msgid "_Task..."
-msgstr "_Tasc..."
+#~ msgid "View messages..."
+#~ msgstr "Feach scéalaí..."
 
-msgid "Sear_ch"
-msgstr "_Cuardaigh"
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Álbachtaí Pilot..."
 
-msgid "Card: "
-msgstr "Carta: "
+#~ msgid "_End of day:"
+#~ msgstr "_Deireadh an Lá"
 
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ainm: "
+#~ msgid "%s server %s"
+#~ msgstr "%s freastalaí %s"
 
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-" Clann:       "
+#~ msgid "(unknown host)"
+#~ msgstr "(óst gan fhois)"
 
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Seoladh:"
+#~ msgid "No such message: %s"
+#~ msgstr "Ni raibh scéal sinn: %s"
 
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-" Bosca Phoist: "
+#~ msgid " Edit "
+#~ msgstr "Eagar "
 
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Stráid:      "
+#~ msgid "Signature name:"
+#~ msgstr "Ainm Siniú:"
 
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cathair:     "
+#~ msgid "_Other"
+#~ msgstr "_Eile"
 
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Cuige:      "
+#~ msgid "Run %s"
+#~ msgstr "Rith %s"
 
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Cód Phoist:  "
+#~ msgid "Close %s"
+#~ msgstr "Dún %s"
 
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-" Tír:          "
+#~ msgid "page"
+#~ msgstr "leathanach"
 
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Gutháin:   \n"
+#~ msgid "RDF Summary"
+#~ msgstr "Coimriú RDF"
 
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Guthán:"
+#~ msgid "Mailbox Format"
+#~ msgstr "Formóid Boscaphoist"
 
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"R-phost:\n"
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Inbosca"
 
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Am Críos: "
+#~ msgid "Display"
+#~ msgstr "Taispeán"
 
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ainm:  "
+#~ msgid "Edit..."
+#~ msgstr "Eagar..."
 
-msgid "New _Contact"
-msgstr "_Tadhall Nua"
+#~ msgid "News"
+#~ msgstr "Nuacht"
 
-msgid "New _Task"
-msgstr "_Tasc Nua"
+#~ msgid "_Organization:"
+#~ msgstr "_Buidheann"
 
-msgid "(Unknown)"
-msgstr "(Gan fhois)"
+#~ msgid "_Server type: "
+#~ msgstr "Saghas _Freastalaí: "
 
-msgid "New _Mail Message"
-msgstr "Scéal_Post Nua"
+#~ msgid "seconds."
+#~ msgstr "soicind."
 
-msgid "GnomeCard:"
-msgstr "GnomeCard: "
+#~ msgid "Mail Summary"
+#~ msgstr "Coimriú Nua"
 
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
+#~ msgid "(No name)"
+#~ msgstr "(gan ainm)"
 
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Cruthaigh Cruinniú _Nua"
 
-msgid "%d"
-msgstr "%d"
+#~ msgid "New Appointment"
+#~ msgstr "Coinne Nua"
 
-msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
+#~ msgid "_Appointment..."
+#~ msgstr "_Coinne..."
 
-msgid "SASL"
-msgstr "SASL"
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Álbachtaí _Féilire..."
 
-msgid "URI"
-msgstr "URI"
+#~ msgid "_Task..."
+#~ msgstr "_Tasc..."
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Cuardaigh"
+
+#~ msgid "Card: "
+#~ msgstr "Carta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ainm: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Clann:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Seoladh:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Bosca Phoist: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Stráid:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cathair:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cuige:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cód Phoist:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Tír:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gutháin:   \n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Guthán:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "R-phost:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Am Críos: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ainm:  "
+
+#~ msgid "New _Contact"
+#~ msgstr "_Tadhall Nua"
+
+#~ msgid "New _Task"
+#~ msgstr "_Tasc Nua"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(Gan fhois)"
 
-msgid "a"
-msgstr "a"
+#~ msgid "New _Mail Message"
+#~ msgstr "Scéal_Post Nua"
 
-msgid "b"
-msgstr "b"
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard: "
 
-msgid "c"
-msgstr "c"
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
 
-msgid "e"
-msgstr "e"
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
 
-msgid "f"
-msgstr "f"
+#~ msgid "%d"
+#~ msgstr "%d"
 
-msgid "g"
-msgstr "g"
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%a %d/%m/%Y"
 
-msgid "h"
-msgstr "h"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-msgid "i"
-msgstr "i"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-msgid "j"
-msgstr "j"
+#~ msgid "a"
+#~ msgstr "a"
 
-msgid "k"
-msgstr "k"
+#~ msgid "b"
+#~ msgstr "b"
 
-msgid "l"
-msgstr "l"
+#~ msgid "c"
+#~ msgstr "c"
 
-msgid "m"
-msgstr "m"
+#~ msgid "e"
+#~ msgstr "e"
 
-msgid "o"
-msgstr "o"
+#~ msgid "f"
+#~ msgstr "f"
 
-msgid "p"
-msgstr "p"
+#~ msgid "g"
+#~ msgstr "g"
 
-msgid "q"
-msgstr "q"
+#~ msgid "h"
+#~ msgstr "h"
 
-msgid "t"
-msgstr "t"
+#~ msgid "i"
+#~ msgstr "i"
 
-msgid "u"
-msgstr "u"
+#~ msgid "j"
+#~ msgstr "j"
 
-msgid "v"
-msgstr "v"
+#~ msgid "k"
+#~ msgstr "k"
 
-msgid "w"
-msgstr "w"
+#~ msgid "l"
+#~ msgstr "l"
 
-msgid "y"
-msgstr "y"
+#~ msgid "m"
+#~ msgstr "m"
 
-msgid "z"
-msgstr "z"
+#~ msgid "o"
+#~ msgstr "o"
 
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#~ msgid "p"
+#~ msgstr "p"
 
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#~ msgid "q"
+#~ msgstr "q"
 
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#~ msgid "t"
+#~ msgstr "t"
 
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#~ msgid "u"
+#~ msgstr "u"
 
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#~ msgid "v"
+#~ msgstr "v"
 
-msgid "View All"
-msgstr "Feach Gach Rud"
+#~ msgid "w"
+#~ msgstr "w"
 
-msgid "_Day"
-msgstr "Lá"
+#~ msgid "y"
+#~ msgstr "y"
 
-msgid "About..."
-msgstr "Faoi..."
+#~ msgid "z"
+#~ msgstr "z"
 
-msgid "Address _Book... (FIXME)"
-msgstr "Leabhair Sheolaidh"
+#~ msgid "%I:%M%p"
+#~ msgstr "%I:%M%p"
 
-msgid "C_lear"
-msgstr "_Bunaigh"
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
 
-msgid "Close this appointment"
-msgstr "Dún an coinne seo"
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
 
-msgid "Pre_vious"
-msgstr "_Riomh"
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
 
-msgid "_Note (FIXME)"
-msgstr "_Nota (FIXME)"
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
 
-msgid "_Task (FIXME)"
-msgstr "_Tasc (FIXME)"
+#~ msgid "View All"
+#~ msgstr "Feach Gach Rud"
 
-msgid "Reply to all"
-msgstr "Freagrair do Gach rud"
+#~ msgid "_Day"
+#~ msgstr "Lá"
 
-msgid "_Reply"
-msgstr "_Freagrair"
+#~ msgid "About..."
+#~ msgstr "Faoi..."
 
-msgid "Save in _folder... (FIXME)"
-msgstr "Sábháil mar _fillteán (FIXME)"
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Leabhair Sheolaidh"
 
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
+#~ msgid "C_lear"
+#~ msgstr "_Bunaigh"
 
-msgid "New Contact _List"
-msgstr "_Líosta Tadhall Nua"
+#~ msgid "Close this appointment"
+#~ msgstr "Dún an coinne seo"
 
-msgid "Co_ntacts:"
-msgstr "_Tadhallaí"
+#~ msgid "Pre_vious"
+#~ msgstr "_Riomh"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (FIXME)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tasc (FIXME)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair do Gach rud"
+
+#~ msgid "_Reply"
+#~ msgstr "_Freagrair"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Sábháil mar _fillteán (FIXME)"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
+
+#~ msgid "New Contact _List"
+#~ msgstr "_Líosta Tadhall Nua"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "_Tadhallaí"
diff --git a/po/gl.po b/po/gl.po
index 46173d39d4..c91929e52e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -21,6 +21,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \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 "Editar o Libro de Enderezos"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "con todos os cartafoles locais e cos remotos activos"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Gardar Como"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Tarefas "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "Sen tarxetas"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 tarxeta"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Co_ntactos:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Fiestra de Evolution"
+
 #: addressbook/conduit/address-conduit.c:272
 #, fuzzy
 msgid "Default Sync Address:"
@@ -111,56 +153,72 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Libro de Enderezos"
 
-#: 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 "Eliminar"
 
-#: 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 "Propiedades..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "Novo Contacto:"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crear unha nova lista de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Crear unha nova tarefa"
+
+#: addressbook/gui/component/addressbook-config.c:407
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -168,7 +226,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -176,27 +234,27 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
@@ -223,17 +281,17 @@ msgstr "Examinando %s"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
 
@@ -281,7 +339,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -290,7 +348,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -300,7 +358,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -312,7 +370,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -322,15 +380,15 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -338,17 +396,17 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "O URI que ha amosar a axenda"
@@ -372,17 +430,11 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Dete_ctar tipos soportados "
 
-#: 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
@@ -397,65 +449,56 @@ msgstr "Dete_ctar tipos soportados "
 #: 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
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "_Fontes do Libro de Enderezos..."
-
-#: 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
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anónimo"
 
-#: 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"
@@ -463,56 +506,56 @@ msgid ""
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "B_uscar"
 
-#: 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 "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Grupo"
 
-#: 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
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: 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"
@@ -522,33 +565,28 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Único"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Selected:"
-msgstr "Eliminada"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -559,7 +597,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -568,7 +606,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -576,43 +614,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Specifying a\n"
 "\t\t\t  display name and group is the first step in setting\n"
 "\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Información da Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Conectando ao servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Conectando ao servidor..."
 
-#: 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
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: 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"
@@ -621,7 +659,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -629,7 +667,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -639,7 +677,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -649,27 +687,27 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -679,7 +717,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -689,7 +727,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: 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"
@@ -697,29 +735,29 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -727,67 +765,55 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_Editar"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
@@ -823,7 +849,7 @@ msgid "Send HTML Mail?"
 msgstr "¿Enviar Correo HTML?"
 
 #: 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 "Engadir a Contactos"
 
@@ -839,7 +865,7 @@ msgstr "Nome:"
 
 #: 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 "Fonte"
 
@@ -919,7 +945,8 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -929,7 +956,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: 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 "Detalles"
@@ -1018,16 +1045,27 @@ msgstr "Ca_tegorías..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Borrar"
 
+#: 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 "_Editar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
@@ -1074,8 +1112,8 @@ msgid "_Web page address:"
 msgstr "Enderezo da páxina _Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 #, fuzzy
 msgid "Address"
 msgstr "_Enderezo:"
@@ -1083,14 +1121,14 @@ msgstr "_Enderezo:"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 #, fuzzy
 msgid "Editable"
 msgstr "Activado"
@@ -2087,9 +2125,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
@@ -2104,21 +2142,22 @@ msgid "MSN Messenger"
 msgstr "Enviar _Mensaxe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Engadir Servicio"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr ""
@@ -2131,122 +2170,105 @@ msgid "Username"
 msgstr "Nome de _Usuario:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Particular"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
 msgstr "Traballando"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 #, fuzzy
 msgid "Contact"
 msgstr "Contactos"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Nome da Conta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
@@ -2261,6 +2283,7 @@ msgid "_Edit Full"
 msgstr "Editar Completo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Nome Completo:"
@@ -2272,6 +2295,23 @@ msgstr ""
 "\n"
 "Correo Electrónico:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Enderezo _2:"
@@ -2377,27 +2417,30 @@ msgstr "_Tratamento:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Nome da Cont_a:"
+msgid "Add IM Account"
+msgstr "Contas"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Contas"
+msgid "_Account name:"
+msgstr "Nome da Cont_a:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Engadir Servicio"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
 #, fuzzy
-msgid "Location:"
+msgid "_Location:"
 msgstr ""
 "\n"
 "Localización Xeográfica: "
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr ""
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Membros"
@@ -2421,27 +2464,28 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr "editor-de-contactos"
 
-#: 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
 #, fuzzy
 msgid "Book"
 msgstr "Corpo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #, fuzzy
 msgid "Is New List"
 msgstr "Nova Lista"
 
 #. 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 "Editor de Listas de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
@@ -2495,25 +2539,22 @@ msgid "No contacts"
 msgstr "Contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Contactos"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Contactos"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Contactos"
+msgstr[1] "Contactos"
 
-#: 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
 #, fuzzy
 msgid "Query"
 msgstr "Alemaña"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Erro ao iniciar %s"
@@ -2527,142 +2568,141 @@ msgstr "Móbil"
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: 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 "A categoría é"
 
 #. 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 "Calquera campo contén"
 
-#: 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 "Avanzado..."
 
-#: 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 "Tipo:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Libro de Enderezos"
 
-#: 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 "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: 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 "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: 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 "Cortar"
 
-#. 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 "Copiar"
 
-#: 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 "Pegar"
 
-#: 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
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2671,7 +2711,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Calquera Categoría"
@@ -2705,8 +2745,6 @@ msgid "Car Phone"
 msgstr "Teléfono do Automóbil"
 
 #: 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 "Categorías"
 
@@ -2715,7 +2753,7 @@ msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -2770,6 +2808,7 @@ msgid "Manager"
 msgstr "Xestor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
@@ -2778,7 +2817,7 @@ msgid "Nickname"
 msgstr "Alcume"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Nota"
 
@@ -2787,7 +2826,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organización"
 
@@ -2845,19 +2884,19 @@ msgid "Web Site"
 msgstr "Sitio Web"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 #, fuzzy
 msgid "Width"
 msgstr "Largura:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 #, fuzzy
 msgid "Height"
 msgstr "Altura:"
 
 #: 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 ""
 
@@ -2917,93 +2956,96 @@ msgstr ""
 msgid "Adapter"
 msgstr "Andorra"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 #, fuzzy
 msgid "Selected"
 msgstr "Eliminada"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 #, fuzzy
 msgid "Has Cursor"
 msgstr "Ordeamento das tarefas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Traballando"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Estonia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Nada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Xeral"
+msgid "work"
+msgstr "Traballando"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "para sempre"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Xeral"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Fax Particular"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Éxito"
 
-#: 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
@@ -3011,108 +3053,108 @@ msgstr "Éxito"
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: 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 "Cancelada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "A autenticación fallou."
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "¿Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimir tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: 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
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: 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
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3121,56 +3163,56 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 #, fuzzy
 msgid "Overwrite"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Erro ao gardar o ficheiro: %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 ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 #, fuzzy
 msgid "list"
 msgstr "Brétema"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Varias 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 de %s"
@@ -3207,36 +3249,33 @@ msgstr "Engadir un enderezo a un contacto existente \"%s\""
 msgid "Querying Address Book..."
 msgstr "Buscando no Libro de Enderezos..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Editar Información de Contacto"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Mestura-lo Enderezo de Correo"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "Outros Contactos"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "non contén"
+msgid_plural "and %d other contacts."
+msgstr[0] "non contén"
+msgstr[1] "non contén"
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
@@ -3391,7 +3430,7 @@ msgstr "Marxes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: 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 "Opcións"
 
@@ -3580,7 +3619,7 @@ msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Contrasinal"
@@ -3669,7 +3708,7 @@ msgid "Evolution's Tasks component"
 msgstr "Compositor de correo de Evolution."
 
 #: 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"
@@ -3719,24 +3758,24 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: 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 "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3745,12 +3784,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Advertencia"
 
-#: 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"
@@ -3758,7 +3797,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3769,7 +3808,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
@@ -3946,13 +3985,13 @@ msgstr "O comentario contén"
 msgid "Location contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: 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 "Axenda"
 
@@ -3974,7 +4013,7 @@ msgid "Purge events older than"
 msgstr "é menor que"
 
 #: 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 "días"
 
@@ -3985,7 +4024,7 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4007,81 +4046,81 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d de %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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuración da Fonte de Novas"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 #, fuzzy
 msgid "M_eeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4111,11 +4150,6 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Personalizar"
-
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4135,16 +4169,16 @@ msgstr "Permiso denegado"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -4214,11 +4248,11 @@ msgstr "Amosar un diálogo"
 msgid "extra times every"
 msgstr "veces cada"
 
-#: 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 "horas"
 
-#: 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 "minutos"
 
@@ -4241,11 +4275,11 @@ msgstr "Básico"
 msgid "Date/Time:"
 msgstr "Data/Hora:"
 
-#: 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 "Amosar unha mensaxe"
 
-#: 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 "Tocar un son"
 
@@ -4254,18 +4288,17 @@ msgstr "Tocar un son"
 msgid "Reminders"
 msgstr "Recordatorio"
 
-#: 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 "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#, fuzzy
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
 #: 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 "Resumo:"
@@ -4296,7 +4329,7 @@ msgid "hour(s)"
 msgstr "hora(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 "minutos"
 
@@ -4306,8 +4339,8 @@ msgstr "comezo da cita"
 
 #. 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 "Activado"
 
@@ -4323,19 +4356,19 @@ msgstr "Non eliminar"
 
 #: 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 "Desactivar"
 
 #: 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 "Activado"
 
@@ -4359,7 +4392,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmas"
@@ -4385,7 +4418,7 @@ msgid "Days"
 msgstr "Días"
 
 #: 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 "A_ctivar"
 
@@ -4483,7 +4516,7 @@ msgid "Wednesday"
 msgstr "Mércores"
 
 #: 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 "Semana Laboral"
 
@@ -4531,7 +4564,6 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Xeral"
 
@@ -4628,7 +4660,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de _Tarefas"
@@ -4773,28 +4805,28 @@ msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, fuzzy, c-format
 msgid "Validation error: %s"
 msgstr "Erro descoñecido: %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 " a "
 
-#: 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 " (Completada "
 
-#: 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 "Completada "
 
-#: 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 " (Pendente "
 
-#: 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 "Pendente "
 
@@ -4831,8 +4863,9 @@ msgstr "Entrada de diario - %s"
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: 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 "Gardar como..."
 
@@ -4847,35 +4880,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Cancelar Operación"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Escolla un cartafol de destino para importar estes datos"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Axenda"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Lista de _Tarefas"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4904,19 +4922,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "¿Está seguro de que quere borrar %d citas?"
+#, 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] "¿Está seguro de que quere borrar %d citas?"
+msgstr[1] "¿Está seguro de que quere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "¿Está seguro de que quere borrar %d tarefas?"
+#: 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] "¿Está seguro de que quere borrar %d tarefas?"
+msgstr[1] "¿Está seguro de que quere borrar %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "¿Está seguro de que quere borrar %d entradas de diario?"
+#: 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] "¿Está seguro de que quere borrar %d entradas de diario?"
+msgstr[1] "¿Está seguro de que quere borrar %d entradas de diario?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4983,7 +5007,7 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: 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 "Cita"
 
@@ -5059,8 +5083,6 @@ msgstr "Axenda"
 
 #: 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 "Clasificación"
 
@@ -5117,13 +5139,13 @@ msgstr "Hora de _comezo:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nada"
 
@@ -5181,13 +5203,13 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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
@@ -5380,7 +5402,7 @@ msgid "_No recurrence"
 msgstr "Se_n recorrencia"
 
 #: 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 "Elimina_r"
 
@@ -5423,7 +5445,7 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: 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 ""
 
@@ -5432,6 +5454,28 @@ msgstr ""
 msgid "Save Event"
 msgstr "Mensaxe da Axenda"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Seleccionar Cartafol"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Escolla un cartafol de destino para importar estes datos"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Axenda"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Lista de _Tarefas"
+
 #: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
@@ -5464,39 +5508,39 @@ msgstr "% Completo"
 #: 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 "Completada"
 
 #: 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 "Alta"
 
 #: 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 "En Progreso"
 
 #: 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 "Baixa"
 
 #: 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 "Non Iniciada"
 
@@ -5512,7 +5556,7 @@ msgstr "Indefinida"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Data Completada:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5556,9 +5600,9 @@ msgstr "Non se pode abrir o libro de enderezos"
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: 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 "Descrición:"
 
@@ -5568,11 +5612,13 @@ msgid "Folder:"
 msgstr "Carta_fol:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Data de _Inicio:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Data Límite"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5631,140 +5677,113 @@ msgid "Weekly"
 msgstr "Semana"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d días"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 día"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d semanas"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 semana"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d horas"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 hora"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutos"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d días"
+msgstr[1] "%d días"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minuto"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semanas"
+msgstr[1] "%d semanas"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d horas"
+msgstr[1] "%d horas"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 segundo"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutos"
+msgstr[1] "%d minutos"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Enviar unha mensaxe"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundos"
+msgstr[1] "%d segundos"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Treboada descoñecida"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "despois da fin da cita"
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "despois da fin da cita"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "Servidor %s %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 ""
 
-#: 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 "Público"
 
-#: 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 "Privado"
 
-#: 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 "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Descrición:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Data Final"
 
-#: 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 "Data de _Inicio:"
 
-#: 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 "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-#, fuzzy
-msgid "color"
-msgstr " cor"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Cita"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Libre"
@@ -5800,146 +5819,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 "Si"
 
-#: 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 "Non"
 
 #. 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 "Descoñecido"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-#, fuzzy
-msgid "Deleting selected objects"
-msgstr "Elimina-los contactos seleccionados"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Nova _Cita..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Novo _Evento de Día Completo"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-#, fuzzy
-msgid "New Meeting"
-msgstr "Xuntanza"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Nova Tarefa"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Imprimir..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: 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 "Ir a _Hoxe"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Ir á Data..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar Información de Libre/Ocupado"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Abrir"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Gardar _Como..."
-
-#: 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 "Co_rtar"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: calendar/gui/e-cal-view.c:1295
-#, fuzzy
-msgid "_Schedule Meeting..."
-msgstr "_Programar Xuntanza"
-
-#: calendar/gui/e-cal-view.c:1296
-#, fuzzy
-msgid "_Forward as iCalendar..."
-msgstr "Remitir como i_Calendar"
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Borrar esta _Ocorrencia"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Borrar _Tódalas Ocorrencias"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Preferencias de Correo..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5985,36 +5897,90 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Elimina-los contactos seleccionados"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr ""
+
+#: 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 "_Abrir"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
-#: 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 "Gardar _Como..."
+
+#: 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 "_Imprimir..."
+
+#: 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 "Co_rtar"
+
+#: 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 "_Copiar"
+
+#: 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 "_Pegar"
+
+#: calendar/gui/e-calendar-table.c:1053
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: 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 "_Borra-las Tarefas Seleccionadas"
 
-#: 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 "Prema para engadir unha tarefa"
 
@@ -6023,38 +5989,105 @@ msgstr "Prema para engadir unha tarefa"
 msgid "% Complete"
 msgstr "% Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: 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 "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Data Límite"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Posición Xeográfica"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: 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 "Nova _Cita..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Novo _Evento de Día Completo"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#, fuzzy
+msgid "New Meeting"
+msgstr "Xuntanza"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Nova Tarefa"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Seleccionar _Fío"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Eliminar..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Publicar Información de Libre/Ocupado"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "_Copiar a un Cartafol..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Mover ó Cartafol.."
+
+#: calendar/gui/e-calendar-view.c:1276
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "_Programar Xuntanza"
+
+#: calendar/gui/e-calendar-view.c:1277
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Remitir como i_Calendar"
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Borrar esta _Ocorrencia"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Borrar _Tódalas Ocorrencias"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Ir a _Hoxe"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Ir á Data..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Preferencias de Correo..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6086,26 +6119,26 @@ msgstr "%02i divisións de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d de %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"
@@ -6115,117 +6148,105 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recorrencia _simple"
 
-#: calendar/gui/e-itip-control.c:603
-#, fuzzy
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Cada"
+msgid_plural "Every %d days"
+msgstr[0] "Cada"
+msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, fuzzy, c-format
-msgid "Every %d days"
-msgstr "%d días"
-
-#: calendar/gui/e-itip-control.c:611
-#, fuzzy
 msgid "Every week"
-msgstr "Cada"
+msgid_plural "Every %d weeks"
+msgstr[0] "Cada"
+msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:613
-#, fuzzy, c-format
-msgid "Every %d weeks"
-msgstr "%d semanas"
-
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, c-format
 msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, fuzzy, c-format
-msgid "Every %d weeks on "
-msgstr "%d semanas"
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 #, fuzzy
 msgid " and "
 msgstr "Area"
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:651
-#, fuzzy
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "Un m_es"
+msgid_plural "every %d months"
+msgstr[0] "Un m_es"
+msgstr[1] "Un m_es"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
-#, fuzzy
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Cada"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] "Cada"
+msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrición:</b> %s"
 
-#: 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
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "información de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: 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
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente descoñecido"
 
 #. 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."
@@ -6233,327 +6254,334 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
+#: calendar/gui/e-itip-control.c:930
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
+
 #. 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
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: 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 "Aceptado"
 
-#: 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
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: 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 "Rexeitado"
 
-#: 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
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acción"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 #, fuzzy
 msgid "Update"
 msgstr "Actualización de Tarefa"
 
-#: 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 "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: 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> publicou información sobre unha reunión."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: 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> require a súa presencia nunha reunión."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: 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> desexa asistir a unha reunión existente."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: 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> desexa recibir a última información sobre a reunión."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: 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> respostou a unha petición de xuntanza."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: 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> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: 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> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: 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> publicou información sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: 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> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: 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> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: 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> desexa recibir a última información sobre a tarefa."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: 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> respostou a unha asignación de tarefa."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: 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> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: 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> publicou información de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: 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> require a súa información libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: 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> respostou a unha petición de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Actualización completada\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 ""
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: 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 "¡Elemento enviado!\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 "¡Non se puido envia-lo elemento!\n"
 
@@ -6689,7 +6717,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6775,12 +6803,12 @@ msgstr "_Prioridade:"
 msgid "Web Page:"
 msgstr "Páxina"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Prema para engadir unha tarefa"
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6788,7 +6816,7 @@ msgid ""
 msgstr "Erro ao iniciar %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"
@@ -6796,62 +6824,64 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Cargar _Imaxes"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Non hai citas"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Cargar _Imaxes"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
@@ -6873,45 +6903,46 @@ msgid "February"
 msgstr "febreiro"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ir á Data"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "xaneiro"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "xullo"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "xuño"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "maio"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "novembro"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "outubro"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Seleccionar Nomes"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "setembro"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Ir a hoxe"
+msgid "_Select Today"
+msgstr "Seleccionar cartafol"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -7001,7 +7032,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7158,85 +7189,85 @@ msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a, %d de %b de %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, %d de %b"
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%a %d de %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, %d de %b de %Y"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 #, fuzzy
 msgid "Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "E_stado:"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioridade:"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Categorías: "
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 #, fuzzy
 msgid "Contacts: "
 msgstr "Co_ntactos:"
 
-#: 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 "Previsualización da Impresión"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
@@ -7245,40 +7276,40 @@ msgstr "Configuración da Impresión"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -9042,7 +9073,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Non foi posible abrir o directorio de caché: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -9053,7 +9084,7 @@ msgstr ""
 "As posteriores operacións deste servidor non se han repetir cando\n"
 "se volte conectar á rede."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -9064,7 +9095,7 @@ msgstr ""
 "%s\n"
 "Os cambios que se fixeron a este cartafol non se han resincronizar."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Volvendo a sincronizar co servidor"
 
@@ -9081,7 +9112,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "Creando o cartafol %s"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operación"
 
@@ -9199,36 +9230,40 @@ msgstr "(coinciden-todas) require un único resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiando as mensaxes"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
@@ -9258,7 +9293,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 "Cancelado."
 
@@ -9632,7 +9668,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -9837,7 +9873,7 @@ msgstr "Outro erro"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tipo de Servidor: "
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -9847,24 +9883,25 @@ msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "xuño"
@@ -10094,19 +10131,19 @@ msgstr "Non existe a mensaxe %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -10142,41 +10179,40 @@ msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Nome do Servidor"
+msgid "Address Book And Calendar"
+msgstr "Libro de Enderezos"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Base da busca:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Contrasinal"
 
-#: 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 ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Brétema espesa"
@@ -10184,12 +10220,12 @@ msgstr "Brétema espesa"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
@@ -10245,12 +10281,12 @@ msgstr "O cartafol foi destruido e rexenerado no servidor."
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: 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
@@ -10266,25 +10302,25 @@ msgstr ""
 "Non é posible obter a mensaxe: %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 "Non existe a mensaxe"
 
-#: 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 "Esta mensaxe non está dispoñible actualmente."
 
-#: 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 "Recollendo información de resumo para as mensaxes novas"
 
-#: 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 "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -10363,18 +10399,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio %s para %s en %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
@@ -10384,14 +10420,14 @@ msgstr "Servicio %s para %s en %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %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 ""
 
-#: 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
@@ -10399,53 +10435,53 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o nome de usuario: %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
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operación non soportada"
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "A autenticación fallou."
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Non foi posible conectarse ó servidor: %s."
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticación %s solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non hai soporte para o tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10456,32 +10492,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "O nome do cartafol non pode conter o carácter Return."
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "O nome do cartafol non pode conter o carácter Return."
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -10514,20 +10551,20 @@ msgid "Index message body data"
 msgstr "Enviar mensaxe a un contacto"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -10590,7 +10627,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"
@@ -10639,8 +10676,8 @@ msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de índice de cartafol `%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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
@@ -10671,14 +10708,14 @@ msgstr "Contido da mensaxe non válido"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "O cartafol `%s' non existe."
@@ -10697,7 +10734,7 @@ msgstr "`%s' non é un directorio maildir."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
@@ -10706,30 +10743,30 @@ msgstr "Non foi posible borrar o cartafol `%s': %s"
 msgid "not a maildir directory"
 msgstr "non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%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 "Non se pode abri-la ruta do directorio maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Comprobando o novo correo"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: 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
@@ -10779,7 +10816,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -10810,32 +10847,32 @@ msgstr "`%s' non é un ficheiro normal."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "O cartafol `%s' non está baleiro. Non borrado."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de cartafol indicado non é válido: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -10884,7 +10921,7 @@ msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -10928,14 +10965,14 @@ msgstr "Enviar mensaxe a un contacto"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Non é posible obter o cartafol: %s: %s"
@@ -11218,48 +11255,48 @@ msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "O comando IMAP fallou: %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
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 #, fuzzy
 msgid "Use cancel"
 msgstr "Cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Operación cancelada"
@@ -11307,7 +11344,7 @@ msgstr "Borrar despois de %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11398,7 +11435,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%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"
 
@@ -11454,12 +11491,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: 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 ""
 "Para entregar correo por conexión a un servidor de correo remoto usando "
 "SMTP.\n"
@@ -11589,13 +11627,13 @@ msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "A petición AUTH expirou: %s"
+msgid "STARTTLS command failed: %s"
+msgstr "O comando IMAP fallou: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
-msgid "STARTTLS response error"
-msgstr "Erro na resposta RSET: %s"
+msgid "STARTTLS command failed"
+msgstr "O comando IMAP fallou: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
@@ -11629,160 +11667,158 @@ msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vía %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "Saúdo SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, fuzzy, c-format
-msgid "HELO request timed out: %s"
-msgstr "A petición RSET expirou: %s"
+msgid "HELO command failed: %s"
+msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
+#: camel/providers/smtp/camel-smtp-transport.c:960
 #, fuzzy
-msgid "HELO response error"
-msgstr "Erro na resposta RSET: %s"
+msgid "HELO command failed"
+msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticación SASL."
 
-#: 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 "A petición AUTH expirou: %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 "O comando IMAP fallou: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "A petición AUTH fallou."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "O comando IMAP fallou: %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 "Mala resposta de autenticación do servidor.\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 "A petición MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
+#: camel/providers/smtp/camel-smtp-transport.c:1170
 #, fuzzy
-msgid "MAIL FROM response error"
-msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
+msgid "MAIL FROM command failed"
+msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "A petición RCPT TO expirou: %s: correo non enviado"
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "A petición DATA expirou: %s: correo non enviado"
+#: 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 "Erro na resposta DATA: %s: correo non enviado"
 
 #. 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
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
 #, fuzzy
-msgid "DATA response error"
-msgstr "Erro na resposta RSET: %s"
-
-#: 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 "O envío de DATA expirou: remate da mensaxe: %s: correo non enviado"
+msgid "DATA command failed"
+msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-#, fuzzy
-msgid "DATA termination response error"
-msgstr "Mala resposta de autenticación do servidor."
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "O comando IMAP fallou: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "A petición RSET expirou: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
 #, fuzzy
-msgid "RSET response error"
-msgstr "Erro na resposta RSET: %s"
+msgid "RSET command failed"
+msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, fuzzy, c-format
-msgid "QUIT request timed out: %s"
-msgstr "A petición AUTH expirou: %s"
+msgid "QUIT command failed: %s"
+msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy
-msgid "QUIT response error"
-msgstr "Erro na resposta RSET: %s"
+msgid "QUIT command failed"
+msgstr "O comando IMAP fallou: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: 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 "anexo"
 
-#: 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 "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro á mensaxe"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ese non é un ficheiro normal."
@@ -11805,24 +11841,24 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
 msgstr "descrición"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Anexar un ficheiro á mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
@@ -11833,45 +11869,45 @@ msgstr "Prema aquí para o libro de enderezos"
 #. * 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 "Responder-A:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: 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 "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: 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."
@@ -11882,12 +11918,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "Post To:"
 msgstr "_Porto:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<prema aquí para seleccionar un cartafol>"
@@ -11897,20 +11933,20 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11919,30 +11955,30 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, ¿sobrescribir?"
 
-#: 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 "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11951,7 +11987,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11960,7 +11996,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11969,7 +12005,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11978,7 +12014,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11987,7 +12023,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesión anterior.\n"
 "¿Gostaríalle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -12000,49 +12036,54 @@ msgstr ""
 
 #: composer/e-msg-composer.c:1567
 #, fuzzy
+msgid "Untitled Message"
+msgstr "(Mensaxe Sen Título)"
+
+#: composer/e-msg-composer.c:1574
+#, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2084
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -12053,7 +12094,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -12062,7 +12103,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12185,7 +12226,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12193,15 +12234,15 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -12293,13 +12334,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12308,101 +12349,82 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 segundo"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 segundo"
+msgstr[1] "1 segundo"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, fuzzy, c-format
-msgid "%d seconds ago"
-msgstr "%d segundos"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
 msgid "1 minute ago"
-msgstr "1 minuto"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minuto"
+msgstr[1] "1 minuto"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, fuzzy, c-format
-msgid "%d minutes ago"
-msgstr "%d minutos"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
 msgid "1 hour ago"
-msgstr "1 hora"
+msgid_plural "%d hours ago"
+msgstr[0] "1 hora"
+msgstr[1] "1 hora"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, fuzzy, c-format
-msgid "%d hours ago"
-msgstr "%d horas"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
 msgid "1 day ago"
-msgstr "1 día"
+msgid_plural "%d days ago"
+msgstr[0] "1 día"
+msgstr[1] "1 día"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, fuzzy, c-format
-msgid "%d days ago"
-msgstr " atrás"
-
-#: filter/filter-datespec.c:69
-#, fuzzy
 msgid "1 week ago"
-msgstr "1 semana"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 semana"
+msgstr[1] "1 semana"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, fuzzy, c-format
-msgid "%d weeks ago"
-msgstr "%d semanas"
-
-#: filter/filter-datespec.c:70
-#, fuzzy
 msgid "1 month ago"
-msgstr "mes"
+msgid_plural "%d months ago"
+msgstr[0] "mes"
+msgstr[1] "mes"
 
-#: filter/filter-datespec.c:70
-#, fuzzy, c-format
-msgid "%d months ago"
-msgstr " atrás"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, c-format
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, fuzzy, c-format
-msgid "%d years ago"
-msgstr " atrás"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Seleccionar un Fuso Horario"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Regras de Filtrado"
 
 #: filter/filter-file.c:166
@@ -12410,28 +12432,29 @@ msgstr "Regras de Filtrado"
 msgid "You must specify a file name."
 msgstr "Nome do estilo:"
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 #, fuzzy
 msgid "Choose a file"
 msgstr "Escolla unha Acción"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Entón"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: filter/filter-folder.c:153
 #, fuzzy
 msgid "You must specify a folder."
 msgstr "Nome do estilo:"
 
-#: 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 "Seleccionar Cartafol"
 
@@ -12445,25 +12468,25 @@ 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 "Importante"
 
 #. 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
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. 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
 #, fuzzy
 msgid "Later"
 msgstr "despois"
 
-#: 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 "Proba"
 
@@ -12472,60 +12495,64 @@ msgstr "Proba"
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Sen título"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Se"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Descrición:</b> %s"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "saínte"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Comparar con"
+msgid "    "
+msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Editar Filtros"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Regras de Filtrado"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Editar CartafolesV"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Fontes de CartafolV"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Comparar con"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrante"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Saínte"
-
-#: filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12534,7 +12561,7 @@ msgstr ""
 "A data da mensaxe hase comparar co momento\n"
 "que especifique aquí."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12544,7 +12571,7 @@ msgstr ""
 "relativo a cando se execute o filtro;\n"
 "\"hai unha semana\" por exemplo."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12553,60 +12580,52 @@ msgstr ""
 "A data da mensaxe hase comparar co momento\n"
 "que especifique aquí."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Cartafoles Virtuais"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "unha hora relativa á hora actual"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "atrás"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "meses"
 
-#: 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 "segundos"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "cartafoles específicos namais"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 #, fuzzy
 msgid "the time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "Fontes de CartafolV"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "con todos os cartafoles remotos activos"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "con todos os cartafoles locais e cos remotos activos"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "anos"
 
@@ -12747,7 +12766,7 @@ msgstr "Marcada"
 msgid "Junk Test"
 msgstr "xuño"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12780,8 +12799,8 @@ msgstr "Mover a un Cartafol"
 
 #: filter/libfilter-i18n.h:44
 #, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Enviar unha Mensaxe a un Contacto"
+msgid "Pipe to Program"
+msgstr "Saír do programa"
 
 #: filter/libfilter-i18n.h:45
 #, fuzzy
@@ -12819,24 +12838,24 @@ msgstr "é maior que"
 msgid "returns less than"
 msgstr "é menor que"
 
-#: 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 "Executar un programa:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:56
-#, fuzzy
-msgid "Shell Command"
-msgstr "Compañía"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Tamaño (kB)"
@@ -12861,9 +12880,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Asunto"
@@ -12873,17 +12892,13 @@ msgstr "Asunto"
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Regras"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
@@ -12896,8 +12911,9 @@ msgstr "Editar Regra"
 msgid "Rule name"
 msgstr "Nome da regra: "
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Regras de Puntuación"
 
 #: filter/searchtypes.xml.h:1
@@ -12932,17 +12948,22 @@ msgstr "O asunto contén"
 msgid "Subject does not contain"
 msgstr "O asunto non contén"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Cartafoles Virtuais"
+
 #: filter/vfolder-rule.c:215
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
@@ -13001,8 +13022,8 @@ msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
 msgid "Evolution Mail preferences control"
 msgstr "Compoñente de resumo executivo do correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Correo"
@@ -13012,62 +13033,57 @@ msgstr "Correo"
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: 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
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferencias da Axenda"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Está seguro de que quere borrar esta conta?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Non borrar"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 #, fuzzy
 msgid "[Default]"
 msgstr "Por de_fecto"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da Cont_a:"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: 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
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Nome do estilo:"
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-#, fuzzy
-msgid "[script]"
-msgstr "descrición"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 #, fuzzy
 msgid "Language(s)"
 msgstr "Idioma"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:1000
 #, fuzzy
-msgid "Add script signature"
-msgstr "Engadir criterio"
+msgid "Add signature script"
+msgstr "Borrar todo agás a sinatura"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
@@ -13122,7 +13138,7 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "¿Gostaríalle usar o cartafol de borradores por defecto?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
@@ -13157,314 +13173,344 @@ msgstr "Seguinte Mensaxe Sen Ler"
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Entrada"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Eliminando o cartafol %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Movendo mensaxes a %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copiando as mensaxes a %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, fuzzy, c-format
 msgid "%s"
 msgstr "s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Creando o cartafol %s"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Elimina-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Eliminar"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Vista"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Regras de Filtrado"
+
+#: mail/em-folder-view.c:785
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar polo Au_tor"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Prema para engadir unha tarefa"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Aparicións:"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Asignada"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13473,12 +13519,12 @@ msgstr ""
 "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
 "autenticidade"
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13487,104 +13533,104 @@ msgstr ""
 "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
 "autenticidade"
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Indefinida"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "Cifrar con PGP"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID do certificado:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Inline"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Agochar"
@@ -13594,74 +13640,75 @@ msgstr "Agochar"
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %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
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%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 "Punteiro a ficheiro local (%s) válido no sitio \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: 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 "De"
 
-#: 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 "Responder-A"
 
-#: 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 "Para"
 
-#: 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
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13669,57 +13716,92 @@ msgstr ""
 "Cliente de Correo: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: 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 anexo"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "O usuario cancelou a operación."
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Non se puido verifica-los certificados."
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Cada"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "_Un día"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Unha sema_na"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Un m_es"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13728,22 +13810,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
@@ -13787,34 +13869,34 @@ msgstr "Engadir Libro de Enderezos"
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscribir"
 
-#: 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 "Cartafol"
 
 #. 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 "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13823,27 +13905,27 @@ msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13852,7 +13934,7 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13861,38 +13943,38 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "_Enderezo:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13905,7 +13987,7 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13985,276 +14067,310 @@ msgstr "Borrar esta mensaxe"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Borrar esta mensaxe"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: 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 "Trocar a mostra da barra de cartafoles"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Enviar a mensaxe máis tarde"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Contas"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Enviar as mensaxes en formato HTML por defecto."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Enviar as mensaxes en formato HTML por defecto."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Panel de Previsualización"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "Contacto Orixinal:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -14262,114 +14378,114 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Lista de Mensaxes por Fíos"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Lista de Mensaxes por Fíos"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Mensaxe remitida (sen asunto)"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "Variable"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Importar"
@@ -14413,14 +14529,14 @@ msgstr "Evolution está importando o seu correo de Elm antigo"
 #: 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 "Importando..."
 
 #: 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 "Agarde, por favor"
 
@@ -14469,12 +14585,12 @@ msgstr "Importando"
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "_Prioridade:"
 
-#: 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"
@@ -14489,7 +14605,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14497,7 +14613,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14506,25 +14622,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Importando Datos"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Opcións"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: 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?"
@@ -14559,65 +14675,29 @@ msgstr ""
 msgid "Pine"
 msgstr "Imprimir"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Formato de armacenamento actual:"
-
-#: mail/local-config.glade.h:2
-#, fuzzy
-msgid "Index body contents"
-msgstr "O corpo contén"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Novo formato de armacenamento:"
-
-#: 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 ""
-"Nota: Cando se convirte entre formatos de caixa de correos,\n"
-"un fallo (como por exemplo a falta de espacio no disco)\n"
-"poida que non sexa recuperable automaticamente. Por favor,\n"
-"use esta característica con cuidado."
-
-#: 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 "Non encheu toda a información requirida."
 
 #. 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 "Editor de Contas de Evolution"
 
-#: 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 "_Servidor:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: 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 "_Ruta:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome"
 
@@ -14650,11 +14730,11 @@ msgstr "Respondido a"
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14662,48 +14742,48 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Novo CartafolV"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editar Filtros"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crear unha nova mensaxe"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: 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 "Identidade"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14714,12 +14794,13 @@ msgstr ""
 "de embaixo non precisan que se enchan,\n"
 "a menos que queira incluír esta información no correo que envíe."
 
-#: 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
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14729,16 +14810,16 @@ msgstr ""
 "non está seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opcións"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14748,11 +14829,11 @@ msgstr ""
 "está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: 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 "Xestión de Contas"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14769,138 +14850,260 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: 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 "Conectando ao servidor..."
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " _Check for supported types "
+msgid " Ch_eck for Supported Types "
 msgstr "Dete_ctar tipos soportados "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Previsualizar"
+
 #: mail/mail-config.glade.h:4
 #, fuzzy
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL non está soportado nesta versión de evolution)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL non está soportado nesta versión de evolution)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Idioma"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Comprobando o novo correo"
+
+#: mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+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
+#, fuzzy
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "Mensaxe a Amosar"
+
+#: 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 "Configuración do Correo"
+
+#: 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"
+
+#: 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 "Mensaxes Enviadas e Borradores"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Información de Contas"
-
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:36
 #, fuzzy
-msgid "Add Sc_ript"
-msgstr "Engadir criterio"
+msgid "Add Ne_w Signature..."
+msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:37
 #, fuzzy
-msgid "Add new signature..."
-msgstr "Gravar sinatura"
+msgid "Add _Script"
+msgstr "Engadir criterio"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar un ficheiro á mensaxe"
 
-#: 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 "Anexo"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autenticación"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Xogo de caracteres descoñecido: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:52
 #, fuzzy
-msgid "C_olors"
-msgstr "P_echar"
+msgid "Ch_eck for Supported Types "
+msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-#, fuzzy
-msgid "Checking for New Mail"
-msgstr "Comprobando o novo correo"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Composing Messages"
-msgstr "Compoñer unha mensaxe"
+msgid "Colors"
+msgstr "P_echar"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Configuration"
-msgstr "Configuración do Correo"
+msgid "Confirm _when expunging a folder"
+msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14917,343 +15120,306 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Default Behavior"
-msgstr "Por de_fecto"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:67
 #, fuzzy
-msgid "Default character _encoding:"
+msgid "Default character e_ncoding:"
 msgstr "Codificación de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Deleting Mail"
-msgstr "Recibindo Correo"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
+msgid "Defaults"
+msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: 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 "Feito"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:73
 #, fuzzy
-msgid "Drafts _folder:"
+msgid "Drafts _Folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo contén"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Email _address:"
+msgid "Email _Address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
-msgid "Empty _trash folders on exit"
+msgid "Empty trash folders on e_xit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar accións"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Opcións"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "En correo HTML"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "Cabeceira"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: 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
-#, fuzzy
-msgid "Labels and Colors"
-msgstr "Gardar e Pechar"
-
-#: mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Loading Images"
-msgstr "Cargar _Imaxes"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Localización da caixa do correo"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "Message Display"
-msgstr "Visualización das _Mensaxes"
-
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "A mensaxe contén"
-
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "New Mail Notification"
-msgstr "Configuración do Correo"
-
-#: 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"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Información Opcional"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:91
-#, fuzzy
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy"
-
-#: mail/mail-config.glade.h:92
-#, fuzzy
-msgid "Printed Fonts"
-msgstr "Imprimi-los contactos seleccionados"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:113
 #, fuzzy
-msgid "Re_member this password"
+msgid "Re_member password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:117
 #, fuzzy
-msgid "Receiving _Options"
+msgid "Receiving Options"
 msgstr "Opcións de Recepción"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Remember this _password"
+msgid "Remember _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Información Requirida"
-
-#: mail/mail-config.glade.h:102
-#, fuzzy
-msgid "Restore Defaults"
-msgstr "Opcións por defecto"
-
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "S_ecurity"
-msgstr "Seguridade"
+msgid "S_tandard Font:"
+msgstr "San Marino"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:121
 #, fuzzy
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME Seguro"
+msgid "Security"
+msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Eliminar..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:130
 #, fuzzy
-msgid "Sent _messages folder:"
+msgid "Sent _Messages Folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Mensaxes Enviadas e Borradores"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticación"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Configuración do Servidor"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Gravar sinatura"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "Sinatura _HTML:"
+
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "Contacto Orixinal:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Tipo:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h: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 "
 "dictionary installed."
 msgstr ""
 
-#: 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\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15264,206 +15430,121 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: 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 "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:158
 #, fuzzy
-msgid "_Always sign outgoing messages when using this account"
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:139
-#, fuzzy
-msgid "_Authentication Type: "
-msgstr "Tipo de Autenticación: "
-
-#: mail/mail-config.glade.h:140
-#, fuzzy
-msgid "_Authentication type: "
-msgstr "Tipo de Autenticación: "
-
-#: mail/mail-config.glade.h:141
-#, fuzzy
-msgid "_Automatically check for new mail every"
-msgstr "Comprobar _automaticamente se hai correo novo cada"
-
-#: mail/mail-config.glade.h:142
-#, fuzzy
-msgid "_Automatically insert smiley images"
-msgstr "Comprobar _automaticamente se hai correo novo cada"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:144
-#, fuzzy
-msgid "_Confirm when expunging a folder"
-msgstr "Limpando o cartafol"
-
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "_Default signature:"
-msgstr "Sinatura _HTML:"
-
-#: mail/mail-config.glade.h:146
-#, fuzzy
-msgid "_Defaults"
-msgstr "Opcións por defecto"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:152
-#, fuzzy
-msgid "_Full name:"
-msgstr "_Nome Completo:"
-
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "_HTML Mail"
-msgstr "En correo HTML"
-
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "_Identity"
-msgstr "Identidade"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "xuño"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imaxes se o autor está no libro de enderezos"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: 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 "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
-msgid "_Receiving Mail"
-msgstr "Recepción de Correo"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Eliminar..."
-
-#: mail/mail-config.glade.h:173
-#, fuzzy
-msgid "_Sending Mail"
-msgstr "Enviando Correo"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:175
-#, fuzzy
-msgid "_Signatures"
-msgstr "Sinatura _HTML:"
-
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Standard Font:"
-msgstr "San Marino"
-
-#: mail/mail-config.glade.h:177
-#, fuzzy
-msgid "_Terminal Font:"
-msgstr "Contacto Orixinal:"
-
 #: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
 msgstr "Usar conexión segura (_SSL)"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minutos"
+
 #: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "color"
+msgstr " cor"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15472,7 +15553,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15481,7 +15562,7 @@ msgstr ""
 "Erro ao efectuar a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Traballando"
 
@@ -15489,132 +15570,131 @@ msgstr "Traballando"
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Enviando \"%s\""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Fallou na mensaxe %d de %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Recibindo %d mensaxe(s)"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Recibindo %d mensaxe(s)"
+msgstr[1] "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Gardando %d mensaxe(s)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Gardando %d mensaxe(s)"
+msgstr[1] "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15623,7 +15703,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15632,11 +15712,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15645,25 +15725,21 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Distinguir Maiúsculas"
@@ -15676,92 +15752,86 @@ msgstr "Buscar na Mensaxe"
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Buscar"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Engadir criterio"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Excepcións"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Información da Fonte"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: 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 "Agardando..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%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"
@@ -15771,25 +15841,25 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Gravar sinatura"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 #, fuzzy
 msgid "Edit signature"
 msgstr "Engadir criterio"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nome:"
 
@@ -15819,17 +15889,17 @@ msgstr "Mensaxe remitida"
 msgid "Invalid folder: `%s'"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15838,86 +15908,86 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "A máis alta"
 
-#: 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 "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -15971,7 +16041,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Información da Fonte"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Remitir"
 
@@ -15979,11 +16049,11 @@ msgstr "Remitir"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
@@ -16009,7 +16079,7 @@ msgstr ""
 
 #: mail/message-tags.glade.h:6
 #, fuzzy
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr "Pendente "
 
 #: mail/message-tags.glade.h:7
@@ -16240,7 +16310,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Cancela-la xuntanza deste elemento"
 
-#: 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 ""
 
@@ -16266,26 +16336,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importando"
 
-#: 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 "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16294,34 +16364,34 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: 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"
@@ -16329,26 +16399,26 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuracións existentes"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
@@ -16357,7 +16427,7 @@ msgstr "Importar"
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
@@ -16397,11 +16467,11 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Comezando a importación"
 
-#: 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 "
@@ -16410,11 +16480,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Asistente"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Non se especificou un nome de cartafol"
@@ -16460,16 +16525,16 @@ msgstr "Non foi posible executar o Bug buddy."
 msgid "About Ximian Evolution"
 msgstr "Acerca de Evolution..."
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -16521,7 +16586,6 @@ msgstr "Chile"
 
 #: shell/e-user-creatable-items-handler.c:601
 #: shell/e-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
 msgid "New"
 msgstr "Novo"
 
@@ -16568,16 +16632,17 @@ msgstr "Crear unha nova tarefa"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Active Connections"
+msgid "<b>Active Connections</b>"
 msgstr "Conexións activas"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
+#, fuzzy
+msgid "Active Connections"
+msgstr "Conexións activas"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "As seguintes conexións están activas nestes intres:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
@@ -16704,28 +16769,28 @@ msgstr ""
 "Este asistente guiarao no proceso de importación de\n"
 "ficheiros externos a Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importadores"
 
-#: 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 "Importar"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Non importar"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16757,7 +16822,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16766,100 +16831,111 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:381
+#: shell/main.c:392
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:491
+#: shell/main.c:502
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: 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"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Seleccionar Cartafol"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "En Progreso"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Expresión"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Enderezo de Correo:"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ID do certificado:"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduza o seu contrasinal para %s"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Contrasinal"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
@@ -17067,7 +17143,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "O ID da Tarxeta xa existe"
@@ -17379,7 +17456,7 @@ msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 msgid "Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: 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 "Pegar o contido do portarretallos"
 
@@ -17388,8 +17465,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualización da Impresión"
 
@@ -17439,13 +17516,13 @@ msgstr "Parar a Carga"
 msgid "View the current contact"
 msgstr "a hora actual"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Accións"
 
@@ -17466,14 +17543,10 @@ msgid "_Save as VCard"
 msgstr "_Gardar coma VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Buscar Contactos"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar unha _Mensaxe ao Contacto..."
@@ -17482,62 +17555,58 @@ msgstr "Enviar unha _Mensaxe ao Contacto..."
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Borrar esta cita"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir A"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Atrás"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Adiante"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Ir á _Data"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Ir á data especificada"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Ir ó día de hoxe"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "List"
 msgstr "Brétema"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Seguinte"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Anterior"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
@@ -17546,7 +17615,7 @@ msgstr "Imprimir esta axenda"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar información de Libre/Ocupado para esta axenda"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Fontes"
@@ -17558,35 +17627,55 @@ msgstr "Cartafol que contén citas e eventos"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Seleccionar Nomes"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Ir á data especificada"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Seleccionar cartafol"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Amosa-los Detalles"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Amosar un día"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: 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 "Hoxe"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "a hora actual"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "Cita"
@@ -17868,7 +17957,7 @@ msgstr "Marcar Todas como L_idas"
 msgid "Mark all visible messages as read"
 msgstr "Marcar as mensaxes visibles como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar a mensaxe do portarretallos"
@@ -18041,335 +18130,337 @@ msgid "F_orward As..."
 msgstr "Remitir"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Regras de Filtrado"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo A_utor..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _Destinatarios..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Marcar as mensaxes seleccionadas coma non importantes"
+
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga das imaxes nas mensaxes HTML"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Remiti-lo correo seleccionado no corpo dunha nova mensaxe"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Remiti-lo correo seleccionado citado coma unha resposta"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a alguén"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Remiti-lo correo seleccionado a alguén coma un anexo"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Increase the text size"
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Cargar _Imaxes"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Marcar como _Non Lida"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como Non Imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar as mensaxes seleccionadas coma importante"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Marcar as mensaxes seleccionadas coma non importantes"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar as mensaxes seleccionadas coma non importantes"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Seguinte"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Seguinte Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Seguinte Fío"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Seguinte Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Tarxeta non atopada"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abri-la mensaxe seleccionada no compositor para re-enviala"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Anterior Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Resposta á Tarefa"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Anterior Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Anterior"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a alguén"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Buscar M_ensaxe..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Configurar as opcións de páxina para a impresora actual"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Amosar o Código _Fonte da Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con tódalas cabeceiras"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo código fonte sen procesar da mensaxe"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "CartafolV pola _Lista de Correo"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "CartafolV polo Au_tor"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "CartafolV polos _Destinatarios"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "CartafolV polo A_sunto"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir A"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Inline"
 msgstr "Inline"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "Visualización _Normal"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Renomear..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Recuperar"
 
@@ -18644,45 +18735,45 @@ msgstr "Copia-la tarefa seleccionada"
 msgid "Cut selected task"
 msgstr "Corta-la tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Borrar a tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Borrar a tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Marcar como Completa"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Pegar a tarefa dende o portarretallos"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Borrar a tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Tarefa"
@@ -18831,10 +18922,15 @@ msgstr "Vista Diaria"
 
 #: views/calendar/galview.xml.h:3
 #, fuzzy
+msgid "_List View"
+msgstr "Personalizar"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
 msgid "_Month View"
 msgstr "Vista Mensual"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 #, fuzzy
 msgid "_Work Week View"
 msgstr "Vista de Semana Laboral"
@@ -18870,11 +18966,16 @@ msgstr "Mensaxes"
 
 #: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With _Category"
-msgstr "Coa Categoría"
+msgid "With _Due Date"
+msgstr "_Data Límite"
 
 #: views/tasks/galview.xml.h:2
 #, fuzzy
+msgid "With _Status"
+msgstr "Establecer Estado"
+
+#: views/tasks/galview.xml.h:3
+#, fuzzy
 msgid "_Tasks"
 msgstr "_Tarefa"
 
@@ -18938,14 +19039,10 @@ msgstr "LMMXVSD"
 msgid "%B %Y"
 msgstr "%B de %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 "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Hoxe"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18955,83 +19052,88 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Báltico"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Europeo Central"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Chinés"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Grego"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turco"
 
-#: 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 "Europeo Occidental"
 
-#: 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 "Europeo Occidental"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: 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 "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 #, fuzzy
 msgid "Visual"
 msgstr "Alarmas Visuais"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Xogo de caracteres descoñecido: %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 "Codificación dos Caracteres"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Outro..."
 
@@ -19098,11 +19200,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Buscar"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Gardar Busca"
 
@@ -19126,16 +19233,16 @@ msgstr "Avanzado..."
 msgid "Choose Image"
 msgstr "Escolla unha Acción"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Buscar"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: 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
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
@@ -19169,6 +19276,382 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "_Fontes do Libro de Enderezos..."
+
+#, fuzzy
+#~ msgid "Selected:"
+#~ msgstr "Eliminada"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Contactos"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "Outros Contactos"
+
+#, fuzzy
+#~ msgid "Send an Email"
+#~ msgstr "Enviar unha mensaxe"
+
+#~ msgid "1 day"
+#~ msgstr "1 día"
+
+#~ msgid "1 week"
+#~ msgstr "1 semana"
+
+#~ msgid "1 hour"
+#~ msgstr "1 hora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuto"
+
+#~ msgid "1 second"
+#~ msgstr "1 segundo"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Descrición:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Cita"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmas"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Posición Xeográfica"
+
+#~ msgid "URL"
+#~ msgstr "URL:"
+
+#, fuzzy
+#~ msgid "Every %d days"
+#~ msgstr "%d días"
+
+#, fuzzy
+#~ msgid "Every %d weeks"
+#~ msgstr "%d semanas"
+
+#, fuzzy
+#~ msgid "Every %d weeks on "
+#~ msgstr "%d semanas"
+
+#~ msgid "Go To Date"
+#~ msgstr "Ir á Data"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Ir a hoxe"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Nome do Servidor"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_Base da busca:"
+
+#, fuzzy
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "A petición AUTH expirou: %s"
+
+#, fuzzy
+#~ msgid "STARTTLS response error"
+#~ msgstr "Erro na resposta RSET: %s"
+
+#, fuzzy
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "A petición RSET expirou: %s"
+
+#, fuzzy
+#~ msgid "HELO response error"
+#~ msgstr "Erro na resposta RSET: %s"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "A petición AUTH expirou: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "A petición AUTH fallou."
+
+#, fuzzy
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
+
+#~ msgid "RCPT TO request timed out: %s: mail not sent"
+#~ msgstr "A petición RCPT TO expirou: %s: correo non enviado"
+
+#~ msgid "DATA request timed out: %s: mail not sent"
+#~ msgstr "A petición DATA expirou: %s: correo non enviado"
+
+#, fuzzy
+#~ msgid "DATA response error"
+#~ msgstr "Erro na resposta RSET: %s"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr "O envío de DATA expirou: remate da mensaxe: %s: correo non enviado"
+
+#, fuzzy
+#~ msgid "DATA termination response error"
+#~ msgstr "Mala resposta de autenticación do servidor."
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "A petición RSET expirou: %s"
+
+#, fuzzy
+#~ msgid "RSET response error"
+#~ msgstr "Erro na resposta RSET: %s"
+
+#, fuzzy
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "A petición AUTH expirou: %s"
+
+#, fuzzy
+#~ msgid "QUIT response error"
+#~ msgstr "Erro na resposta RSET: %s"
+
+#, fuzzy
+#~ msgid "%d seconds ago"
+#~ msgstr "%d segundos"
+
+#, fuzzy
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minutos"
+
+#, fuzzy
+#~ msgid "%d hours ago"
+#~ msgstr "%d horas"
+
+#, fuzzy
+#~ msgid "%d days ago"
+#~ msgstr " atrás"
+
+#, fuzzy
+#~ msgid "%d weeks ago"
+#~ msgstr "%d semanas"
+
+#, fuzzy
+#~ msgid "%d months ago"
+#~ msgstr " atrás"
+
+#, fuzzy
+#~ msgid "%d years ago"
+#~ msgstr " atrás"
+
+#~ msgid "Then"
+#~ msgstr "Entón"
+
+#~ msgid "If"
+#~ msgstr "Se"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Editar Filtros"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Editar CartafolesV"
+
+#~ msgid "Outgoing"
+#~ msgstr "Saínte"
+
+#, fuzzy
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Enviar unha Mensaxe a un Contacto"
+
+#, fuzzy
+#~ msgid "Shell Command"
+#~ msgstr "Compañía"
+
+#~ msgid "Rules"
+#~ msgstr "Regras"
+
+#, fuzzy
+#~ msgid "[script]"
+#~ msgstr "descrición"
+
+#, fuzzy
+#~ msgid "Add script signature"
+#~ msgstr "Engadir criterio"
+
+#~ msgid "Current store format:"
+#~ msgstr "Formato de armacenamento actual:"
+
+#, fuzzy
+#~ msgid "Index body contents"
+#~ msgstr "O corpo contén"
+
+#~ msgid "New store format:"
+#~ msgstr "Novo formato de armacenamento:"
+
+#~ 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 ""
+#~ "Nota: Cando se convirte entre formatos de caixa de correos,\n"
+#~ "un fallo (como por exemplo a falta de espacio no disco)\n"
+#~ "poida que non sexa recuperable automaticamente. Por favor,\n"
+#~ "use esta característica con cuidado."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#, fuzzy
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL non está soportado nesta versión de evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Información de Contas"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticación"
+
+#, fuzzy
+#~ msgid "Composing Messages"
+#~ msgstr "Compoñer unha mensaxe"
+
+#, fuzzy
+#~ msgid "Configuration"
+#~ msgstr "Configuración do Correo"
+
+#, fuzzy
+#~ msgid "Default Behavior"
+#~ msgstr "Por de_fecto"
+
+#, fuzzy
+#~ msgid "Deleting Mail"
+#~ msgstr "Recibindo Correo"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "Opcións"
+
+#, fuzzy
+#~ msgid "Labels and Colors"
+#~ msgstr "Gardar e Pechar"
+
+#, fuzzy
+#~ msgid "Loading Images"
+#~ msgstr "Cargar _Imaxes"
+
+#, fuzzy
+#~ msgid "Message Display"
+#~ msgstr "Visualización das _Mensaxes"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "A mensaxe contén"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información Opcional"
+
+#, fuzzy
+#~ msgid "Printed Fonts"
+#~ msgstr "Imprimi-los contactos seleccionados"
+
+#, fuzzy
+#~ msgid "Re_member this password"
+#~ msgstr "Lembrar este contrasinal"
+
+#, fuzzy
+#~ msgid "Remember this _password"
+#~ msgstr "Lembrar este contrasinal"
+
+#~ msgid "Required Information"
+#~ msgstr "Información Requirida"
+
+#, fuzzy
+#~ msgid "Restore Defaults"
+#~ msgstr "Opcións por defecto"
+
+#, fuzzy
+#~ msgid "S_ecurity"
+#~ msgstr "Seguridade"
+
+#, fuzzy
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME Seguro"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Configuración do Servidor"
+
+#, fuzzy
+#~ msgid "_Authentication Type: "
+#~ msgstr "Tipo de Autenticación: "
+
+#, fuzzy
+#~ msgid "_Authentication type: "
+#~ msgstr "Tipo de Autenticación: "
+
+#, fuzzy
+#~ msgid "_Default signature:"
+#~ msgstr "Sinatura _HTML:"
+
+#, fuzzy
+#~ msgid "_Full name:"
+#~ msgstr "_Nome Completo:"
+
+#, fuzzy
+#~ msgid "_Identity"
+#~ msgstr "Identidade"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "xuño"
+
+#, fuzzy
+#~ msgid "_Receiving Mail"
+#~ msgstr "Recepción de Correo"
+
+#, fuzzy
+#~ msgid "_Sending Mail"
+#~ msgstr "Enviando Correo"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Enviando \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Fallou na mensaxe %d de %d"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Engadir criterio"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Excepcións"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Asistente"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "As seguintes conexións están activas nestes intres:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Buscar Contactos"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Ir á _Data"
+
+#~ msgid "Go to today"
+#~ msgstr "Ir ó día de hoxe"
+
+#, fuzzy
+#~ msgid "With _Category"
+#~ msgstr "Coa Categoría"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Fontes do Libro de Enderezos"
 
@@ -19522,9 +20005,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "Servidor NNTP:"
 
-#~ msgid "Select Names"
-#~ msgstr "Seleccionar Nomes"
-
 #, fuzzy
 #~ msgid "Selected Contacts:"
 #~ msgstr "¿Borrar Contacto?"
@@ -19555,10 +20035,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Mensaxe a Amosar"
-
-#, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Descrición:</b> %s"
 
@@ -19575,10 +20051,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Descrición:</b> %s"
-
-#, fuzzy
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "Semana Laboral"
 
@@ -19617,10 +20089,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Non foi posible crear o directorio %s: %s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Previsualizar"
-
-#, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "En Progreso"
 
@@ -19929,9 +20397,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "New _Task"
 #~ msgstr "Nova T_arefa"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "_Fiestra de Evolution"
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "_Fiestra de Evolution"
@@ -20342,9 +20807,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "No cards"
 #~ msgstr "Sen tarxetas"
 
-#~ msgid "1 card"
-#~ msgstr "1 tarxeta"
-
 #~ msgid "%d cards"
 #~ msgstr "%d tarxetas"
 
@@ -20401,9 +20863,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_Save as..."
 #~ msgstr "Gardar como..."
 
-#~ msgid "End Date"
-#~ msgstr "Data Final"
-
 #~ msgid "Print..."
 #~ msgstr "Imprimir..."
 
@@ -20443,9 +20902,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Failed to find a common bulk algorithm."
 #~ msgstr "Non se puido atopar un algoritmo bulk común."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "Non se puido descodifica-la mensaxe."
-
 #, fuzzy
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Non foi posible crear un contexto de sinatura PGP."
@@ -20695,9 +21151,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "You cannot change the format of a non-local folder."
 #~ msgstr "Non se pode cambia-lo formato dun cartafol non local."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Mensaxe Sen Título)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Mensaxe Baleira"
 
@@ -25922,12 +26375,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "News Feeds"
 #~ msgstr "Fontes de _Novas"
 
-#~ msgid "One mont_h"
-#~ msgstr "Un m_es"
-
-#~ msgid "One w_eek"
-#~ msgstr "Unha sema_na"
-
 #, fuzzy
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "_Tempo de refresco (segundos):"
@@ -25945,9 +26392,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Show _today's tasks"
 #~ msgstr "Amosa-las _tarefas de hoxe"
 
-#~ msgid "Tasks "
-#~ msgstr "Tarefas "
-
 #, fuzzy
 #~ msgid "Weather Settings"
 #~ msgstr "Configuración do tempo"
@@ -25967,9 +26411,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_New Feed"
 #~ msgstr "Fontes de _Novas"
 
-#~ msgid "_One day"
-#~ msgstr "_Un día"
-
 #, fuzzy
 #~ msgid "_Show full path for folders"
 #~ msgstr "Amo_sa-las rutas completas dos cartafoles"
@@ -27017,18 +27458,10 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Hulu"
 #~ msgstr "Tuvalu"
 
-#, fuzzy
-#~ msgid "Select a signature script"
-#~ msgstr "Borrar todo agás a sinatura"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "Sinatura _HTML:"
 
 #, fuzzy
-#~ msgid "_Language:"
-#~ msgstr "Idioma"
-
-#, fuzzy
 #~ msgid "_Random"
 #~ msgstr "Radio"
 
@@ -27382,15 +27815,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Non foi posible atopar o enderezo 'De' na mensaxe"
 
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
-
-#~ msgid "RCPT TO response error: %s: mail not sent"
-#~ msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
-
-#~ msgid "DATA response error: %s: mail not sent"
-#~ msgstr "Erro na resposta DATA: %s: correo non enviado"
-
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr "Erro na resposta DATA: remate da mensaxe: %s: correo non enviado"
 
diff --git a/po/hr.po b/po/hr.po
index 189d10f319..b1e54a9345 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0\n"
-"POT-Creation-Date: 2004-03-29 00:22+0200\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-29 00:45+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,7 +12,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: TransDict server\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
@@ -75,10 +76,9 @@ msgid "Configure autocomple here"
 msgstr "Ovdje podesite automatsko nadopunjavanje"
 
 #. Fix me *
-#.  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#. 
-#.  name = e_book_get_name (book);
-#.  Create the contacts group
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:363
@@ -122,79 +122,95 @@ msgid "Manager your S/Mime certificates here"
 msgstr "Upravljanje vašim S/Mime certifikatima"
 
 #: addressbook/gui/component/addressbook-component.c:225
-#, , c-format
+#, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
 #: addressbook/gui/component/addressbook-component.c:313
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "New Address Book"
 msgstr "Novi adresar"
 
 #: addressbook/gui/component/addressbook-component.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:434 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/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 "Obriši"
 
 #: addressbook/gui/component/addressbook-component.c:315
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Postavke..."
 
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:566
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Nova lista kontakata"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "Kontakt _lista"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Napravi novi kontakt popis"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Novi adresar"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Adresar"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Unesi novi zadatak"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Neuspjela prijava na 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 "Nisam mogao obaviti upit na 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 "Server je odgovorio nepodržanim bazama za pretragu"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Greška kod čitanja podataka sheme"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
 
@@ -210,31 +226,29 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice Evolutiona 1.x.\n"
+"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice "
+"Evolutiona 1.x.\n"
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
 #: calendar/gui/migration.c:175 mail/em-migrate.c:1112
+#, c-format
 msgid "Migrating `%s':"
 msgstr "Migriram `%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:430 calendar/gui/migration.c:509
+#: 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 "Na ovom računalu"
 
 #. Create the default Person addressbook
-#.  Create the default Person calendar
-#.  Create the default Person task list
-#.  orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:517
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: 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 "Osobni podaci"
@@ -272,8 +286,10 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 "Vrijeme za izvršavanje ovog upita prekoračuje ograničenje poslužitelja ili\n"
-"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije postavite \n"
-"upit ili povećajte vremensko ograničenje u postavkama poslužitelja direktorija\n"
+"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije "
+"postavite \n"
+"upit ili povećajte vremensko ograničenje u postavkama poslužitelja "
+"direktorija\n"
 "za ovaj adresar."
 
 #: addressbook/gui/component/addressbook.c:287
@@ -288,59 +304,62 @@ msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspješno završen."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
-"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i "
-"imate li dozvole pristupiti joj."
-""
+"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
+"dozvole pristupiti joj."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni URI, "
-"ili je LDAP poslužitelj nedostupan."
+"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
+"URI, ili je LDAP poslužitelj nedostupan."
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
-msgstr "Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova nakon što skinete OpenLDAP sa donjeg linka."
+msgstr ""
+"Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite "
+"koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
+"nakon što skinete OpenLDAP sa donjeg linka."
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni URI, "
-"ili je poslužitelj nedostupan"
+"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
+"URI, ili je poslužitelj nedostupan"
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Ne mogu otvoriti adresar"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
+#, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %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 izvora kontakata koje će pregled ispisati"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "URI koji će prikazati adresar"
 
@@ -365,15 +384,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr " P_rikaži podržane baze "
 
-#: 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
@@ -395,52 +409,44 @@ msgstr " P_rikaži podržane baze "
 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 "Pomoćnik za stvaranje adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Postavke knjige adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Izvori adresara"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Uvijek"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: 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"
@@ -452,49 +458,50 @@ msgstr ""
 "Kliknite gumb \"Primjeni\" kako biste spremili postavke koje ste ovdje "
 "unijeli."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Poštanska adresa"
 
-#: 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 će koristiti ovaj DN za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:20
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution će koristiti ovu adresu e-pošte za prijavljivanje na 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 "Završeno"
 
-#: 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 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Općenito"
 
-#: 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 "Grupa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikada"
 
-#: 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"
@@ -503,30 +510,26 @@ msgid ""
 "your connection. Ask your system administrator if your LDAP server uses "
 "these protocols."
 msgstr ""
-"Sada morate odrediti kako se želite povezati na LDAP poslužitelj. SSL (Secure "
-"Sockets Layer)\n"
+"Sada morate odrediti kako se želite povezati na LDAP poslužitelj. SSL "
+"(Secure Sockets Layer)\n"
 "i TLS (Transport Layer Security) protokole neki poslužitelji koriste u svrhu "
 "kriptografske zaštite\n"
 "veze. Pitajte svog administratora sustava koristi li vaš LDAP poslužitelj "
 "ove protokole."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Jedan"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Ops_eg pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Pretraživanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Označeno"
-
-#: 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"
@@ -536,7 +539,7 @@ msgstr ""
 "akoi\n"
 "on podržava SSL ili 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"
@@ -548,12 +551,11 @@ msgid ""
 msgstr ""
 "Odabiranje ove opcije znači da će Evolution pokušati da koristi samo SSL/TLS "
 "ako okruženje \n"
-"nije sigurno. Na primjer, ako je vaš LDAP server iza vatrozida na "
-"poslu,\n"
+"nije sigurno. Na primjer, ako je vaš LDAP server iza vatrozida na poslu,\n"
 "onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
 "sigurna."
 
-#: 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"
@@ -565,18 +567,18 @@ msgstr ""
 "znači da će vaša baza biti nesigurna, i da ćete biti ranjivi na sigurnosne\n"
 "napade. "
 
-#: 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 "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Odabiranje ove opcije omogućiti će promjenu promjenu uobičajenih postavki"
-"LDAP\n"
+"Odabiranje ove opcije omogućiti će promjenu promjenu uobičajenih "
+"postavkiLDAP\n"
 "Evolution pretraživanja i  upisivanja i mijenjanja kontakata. "
 
-#: 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"
@@ -585,34 +587,33 @@ msgstr ""
 "Određivanje \n"
 "\t\t\t  prikazanog imena i grupe je prvi korak\n"
 "\t\t\t  u podešavanju adresara."
-""
 
-#: 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 "Korak 1: Svojstva mape"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Korak 2: Poslužitelj podataka"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Korak 3: Spajanje na poslužitelj"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Korak 4: Pretraživanje direktorija"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: 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"
@@ -620,11 +621,12 @@ msgid ""
 "if you\n"
 "need to change these options."
 msgstr ""
-"Opcije na ovoj strani kontroliraju broj unosa uključenih u pretragu, i koliko\n"
+"Opcije na ovoj strani kontroliraju broj unosa uključenih u pretragu, i "
+"koliko\n"
 "pretraga uzima vremena. Kontaktirajte vašeg sistem administratora \n"
 "za promijenu ovih opcija."
 
-#: 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"
@@ -635,7 +637,7 @@ msgstr ""
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korijena stabla "
 "direktorija."
 
-#: 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"
@@ -649,7 +651,7 @@ msgstr ""
 "\"sub\" će uključiti sve unose ispod vaše baze za pretragu.\n"
 "Opseg pretrage \"one\" će uključiti samo unose jedan nivo ispod vaše baze.\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"
@@ -664,13 +666,13 @@ msgstr ""
 "Molim kontaktirajte administratora vašeg sustava ako trebate pomoć\n"
 "u pronalaženju tih podataka."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Puno ime vašeg LDAP servera. Na primjer, \"ldap.mojafirma.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"
@@ -679,17 +681,16 @@ msgstr ""
 "Najveći broj unosa za preuzimanje. Ako unesete preveliki \n"
 "broj, vaš će se adresar usporiti."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Metoda koju će Evolution koristiti za vašu prijavu."
-"Postavka \"Email Address\" zahtijeva anonimni pristup na vaš LDAP "
-"poslužitelj."
+"Metoda koju će Evolution koristiti za vašu prijavu.Postavka \"Email Address"
+"\" zahtijeva anonimni pristup na vaš LDAP poslužitelj."
 
-#: 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"
@@ -698,14 +699,16 @@ msgstr ""
 "Ime poslužitelja koje će se pojaviti u popisu mapa Evolutiona.\n"
 "Služi samo za potrebe prikazivanja."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
-msgstr "Ovo je ime koje će se prikazati u list mapa Evolutiona. Ovo je samo za potrebe prikaza."
+msgstr ""
+"Ovo je ime koje će se prikazati u list mapa Evolutiona. Ovo je samo za "
+"potrebe prikaza."
 
-#: 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"
@@ -716,92 +719,81 @@ msgstr ""
 "Ponuđen je popis standardnih portova. Pitajte svog administratora\n"
 "koji port da odaberete."
 
-#: 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 "Ova opcija određuje koliko će pretraga trajati."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "K_oristi SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Koristim adresu elektronske pošte"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: 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"
 "log in information. Please ask your system administrator if you are unsure "
 "of this information."
 msgstr ""
-"Odlučili ste podesiti LDAP poslužitelj. Prvi korak u tom postupku je dati ime poslužitelja i "
-"i podatke za prijavu. Molim kontaktirajte administratora vašeg sustava\n"
+"Odlučili ste podesiti LDAP poslužitelj. Prvi korak u tom postupku je dati "
+"ime poslužitelja i i podatke za prijavu. Molim kontaktirajte administratora "
+"vašeg sustava\n"
 "ako ne znate ove podatke."
 
-#: 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 "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: 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:17
-#: mail/mail-config.glade.h:160 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 "_Uredi"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "Metoda _prijave: "
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "Broj _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Ime poslužitelja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Odziv (minute):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "tab za vezu"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "tab za opće podatke"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "tab za pretragu"
 
@@ -849,7 +841,7 @@ msgstr "Ime"
 
 #: 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 "Izvor"
 
@@ -916,7 +908,8 @@ msgstr "Suradnja"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -951,8 +944,8 @@ msgid ""
 "If this person has the ability to participate in a video conference, enter "
 "their address here."
 msgstr ""
-"Ako ova osoba ima mogućnost sudjelovati u video konferenciji, unesite "
-"njenu adresu ovdje."
+"Ako ova osoba ima mogućnost sudjelovati u video konferenciji, unesite njenu "
+"adresu ovdje."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
@@ -1011,15 +1004,26 @@ msgstr "_Kategorije..."
 #. 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-calendar-table.c:1057 calendar/gui/e-calendar-table.c:1075
-#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1366
-#: mail/em-folder-tree.c:2504 mail/em-folder-view.c:765
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Obriši"
 
+#: 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 "_Uredi"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Kućni:"
@@ -2057,7 +2061,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:2813
+#: 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"
@@ -2072,7 +2076,7 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2816
+#: 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"
@@ -2095,22 +2099,22 @@ msgid "Username"
 msgstr "Korisničko ime"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2481
-#: addressbook/gui/contact-editor/e-contact-editor.c:2777
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Polazno"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2781
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: 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 "Posao"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2482
-#: addressbook/gui/contact-editor/e-contact-editor.c:2785
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Ostalo"
 
@@ -2145,45 +2149,46 @@ msgstr "Promijenjen"
 msgid "Account Name"
 msgstr "Ime računa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1463
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1471
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1695
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Spremi kontakt kao VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2480
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Posao"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: 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:2814
+#: 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:2815
+#: 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:2817
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
+#, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisam mogao pronać element za polje: `%s'"
 
@@ -2337,6 +2342,10 @@ msgstr "Servis _IM:"
 msgid "_Location:"
 msgstr "_Lokacija:"
 
+#: 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 "Članovi"
@@ -2360,7 +2369,7 @@ msgstr "urednik-kontakt-liste"
 #: 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"
@@ -2372,6 +2381,7 @@ msgstr "Je li novi popis"
 
 #. Construct the app
 #: 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 "Urednik kontakt liste"
 
@@ -2426,8 +2436,8 @@ msgstr "Napredna pretraga"
 msgid "No contacts"
 msgstr "Nema kontakata"
 
-#. plural form
 #: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] ""
@@ -2435,7 +2445,7 @@ msgstr[1] ""
 
 #: 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"
@@ -2453,30 +2463,31 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška kod promijene karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Poruka počinje sa"
 
-#: 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 "Kategorija je"
 
 #. 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 "Polje koje sadrži"
 
-#: 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 "Napredno..."
 
-#: 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:12
 #: calendar/gui/e-meeting-list-view.c:249
@@ -2484,95 +2495,97 @@ msgstr "Napredno..."
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "Spremi kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Novi kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Idi u mapu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosljedi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "Ispis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Ispiši omotnicu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "Kopiraj u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "Premjesti u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:432 calendar/gui/tasks-component.c:363
+#: 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 "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: 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 "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1302
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
+#, c-format
 msgid ""
 "The addressbook backend for\n"
 "%s\n"
@@ -2580,11 +2593,11 @@ msgid ""
 msgstr ""
 "Osnovni proces adresara za\n"
 "%s\n"
-"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavili"
-"da je koristite"
+"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavilida je "
+"koristite"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2763,8 +2776,7 @@ msgstr "Visina"
 #: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
-msgstr """"
-"Sadrži Fokus"
+msgstr "Sadrži Fokus"
 
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -2895,7 +2907,6 @@ msgstr "Uspjeh"
 #: 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/imap4/camel-imap-store.c:288
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
@@ -2987,6 +2998,7 @@ msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
 #: addressbook/gui/widgets/eab-gui-util.c:208
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -3002,13 +3014,13 @@ msgid ""
 msgstr ""
 "%s već postoji\n"
 "Želite li  prepisati preko njega?"
-""
 
 #: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Prebriši"
 
 #: addressbook/gui/widgets/eab-gui-util.c:274
+#, c-format
 msgid "Error saving %s: %s"
 msgstr "Greška kod spremanja %s: %s"
 
@@ -3046,29 +3058,34 @@ msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
 #: addressbook/gui/widgets/eab-gui-util.c:771
+#, c-format
 msgid "VCard for %s"
 msgstr "VCard za %s"
 
+#.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
-#.  * addresses (and *only* the e-mail addresses) associated with an existing
-#.  * contact.
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
 #: addressbook/gui/widgets/eab-popup-control.c:188
 msgid "(none)"
 msgstr "(niti jedan) "
 
 #: addressbook/gui/widgets/eab-popup-control.c:450
 msgid "Primary Email"
-msgstr "Glavna email adresa
-"
+msgstr "Glavna email adresa\r"
 
 #: addressbook/gui/widgets/eab-popup-control.c:586
 msgid "Select an Action"
 msgstr "Odaberi akciju"
 
 #: addressbook/gui/widgets/eab-popup-control.c:594
+#, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Unesi novi kontakt \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:610
+#, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adresu postojećim kontaktima \"%s\""
 
@@ -3084,8 +3101,8 @@ msgstr "Promjeni podatke o kontaktu"
 msgid "Merge E-Mail Address"
 msgstr "Spoji elektronske adrese"
 
-#. plural form
 #: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
 msgid "and one other contact."
 msgid_plural "and %d other contacts."
 msgstr[0] ""
@@ -3112,17 +3129,17 @@ msgstr "Kartični pogled"
 msgid "GTK Tree View"
 msgstr "Pogled GTK stabla"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test slanja"
 
-#: 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 "Ovo bi trebalo testirati element toka platna"
 
@@ -3379,17 +3396,22 @@ msgid "Export in asynchronous mode "
 msgstr "Izvoz u asinhronom načinu rada"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
-msgstr "Broj kartica u jednoj izlaznoj datoteci u asinhronom načinu rada, uobičajena veličina je 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+"Broj kartica u jednoj izlaznoj datoteci u asinhronom načinu rada, uobičajena "
+"veličina je 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr """Greška kod argumenata u naredbenoj liniji, molim koristite --help da biste vidjeli "
-"način korištenja."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Greška kod argumenata u naredbenoj liniji, molim koristite --help da biste "
+"vidjeli način korištenja."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -3524,6 +3546,7 @@ msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
+#, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
@@ -3564,6 +3587,7 @@ msgid "No description available."
 msgstr "Opis ne postoji."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:993
+#, c-format
 msgid ""
 "Alarm on %s\n"
 "%s\n"
@@ -3593,6 +3617,7 @@ msgstr ""
 "umjesto toga pokazati normalan prozor za dijalog."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:1119
+#, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
 "configured to run the following program:\n"
@@ -3601,8 +3626,8 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Podsjetnik Evolutions kalendara će biti pokrenut. Ovaj podsjetnik je podešen da "
-"pokrene slijedeći program:\n"
+"Podsjetnik Evolutions kalendara će biti pokrenut. Ovaj podsjetnik je podešen "
+"da pokrene slijedeći program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3787,14 +3812,16 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr "Ova operacija će trajno obrisati sve događaje starije od odabranog vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
+msgstr ""
+"Ova operacija će trajno obrisati sve događaje starije od odabranog "
+"vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
 
 #: calendar/gui/calendar-commands.c:357
 msgid "Purge events older than"
 msgstr "Izbriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "dana"
 
@@ -3803,13 +3830,9 @@ msgid "%A %d %B %Y"
 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.
+#. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1589 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"
 
@@ -3824,83 +3847,87 @@ msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
-#.  month name. You can change the order but don't
-#.  change the specifiers or add anything.
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:464
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
 #: calendar/gui/calendar-component.c:373
+#, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: calendar/gui/calendar-component.c:430
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:926
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:927
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Obveza"
 
-#: calendar/gui/calendar-component.c:928
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:935
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_Kalendar"
 
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
-#: calendar/gui/calendar-component.c:1016
+#: calendar/gui/calendar-component.c:1013
+#, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "NIje moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:1028
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za stvaranje događaja i sastanaka"
 
 #: calendar/gui/calendar-offline-handler.c:192
+#, c-format
 msgid "backend_go_offline(): %s"
 msgstr "backend_go_offline(): %s"
 
 #: calendar/gui/calendar-offline-handler.c:215
+#, c-format
 msgid "backend_go_online(): %s"
 msgstr "backend_go_online(): %s"
 
@@ -3933,10 +3960,12 @@ msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
 #: calendar/gui/comp-editor-factory.c:474
+#, c-format
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
 #: calendar/gui/control-factory.c:142
+#, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nisam mogao otvoriti direktorij u '%s"
 
@@ -4008,11 +4037,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "sati"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "minute"
 
@@ -4097,9 +4126,9 @@ msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
 #. 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:493
-#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
+#. has "activatable" set.
+#: 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 "Omogućeno"
 
@@ -4113,19 +4142,19 @@ msgstr "Nemoj ukloniti"
 
 #: 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:399
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Onemogući"
 
 #: 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:401
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
-#: mail/em-composer-prefs.c:719
+#: 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 "Omogući"
 
@@ -4269,7 +4298,7 @@ msgid "Wednesday"
 msgstr "Srijeda"
 
 #: 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 "Radni tjedan"
 
@@ -4358,18 +4387,22 @@ msgid "You must specify a location to get the calendar from."
 msgstr "Morate navesti lokaciju iz koje ćete dohvatiti kalendar."
 
 #: calendar/gui/dialogs/calendar-setup.c:164
+#, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Lokacija izvora '%s' nije dobro formirana."
 
 #: calendar/gui/dialogs/calendar-setup.c:179
+#, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Lokacija izvora '%s' nije webcal izvor."
 
 #: calendar/gui/dialogs/calendar-setup.c:216
+#, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Datoteka s kodom '%s' već postoji u odabranoj grupi"
 
 #: calendar/gui/dialogs/calendar-setup.c:229
+#, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
 "from"
@@ -4408,7 +4441,7 @@ msgstr ""
 "unijeli."
 
 #: 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 "Novi popis zadataka"
 
@@ -4421,16 +4454,15 @@ msgid ""
 "Specifying a display name and group is the first step in setting up a "
 "calendar."
 msgstr ""
-"Određivanje prikazanog imena i grupe je prvi korak u podešavanju "
-"kalendara."
+"Određivanje prikazanog imena i grupe je prvi korak u podešavanju kalendara."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:19
 msgid ""
 "Specifying a display name and group is the first step in setting up a task "
 "list."
 msgstr ""
-"Određivanje prikazanog imena i grupe je prvi korak u podešavanju "
-"popisa zadataka."
+"Određivanje prikazanog imena i grupe je prvi korak u podešavanju popisa "
+"zadataka."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "Step 2: Remote Folder Parameters"
@@ -4478,7 +4510,8 @@ msgid ""
 "requires you\n"
 "to specify additional parameters."
 msgstr ""
-"Stvarate mapu u grupi koja je spremljena na udaljenoj lokaciji. To zahtjeva \n"
+"Stvarate mapu u grupi koja je spremljena na udaljenoj lokaciji. To "
+"zahtjeva \n"
 "navođenje dodatnih parametara."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:38
@@ -4506,8 +4539,7 @@ msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
-"Obrisani zadataka je pridjeljen, želite li poslati poruku za  "
-"otkazivanje?"
+"Obrisani zadataka je pridjeljen, želite li poslati poruku za  otkazivanje?"
 
 #: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
@@ -4570,6 +4602,7 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređivač?"
 
 #: calendar/gui/dialogs/comp-editor-page.c:440
+#, c-format
 msgid "Validation error: %s"
 msgstr "Greška pri provjeri: %s"
 
@@ -4604,16 +4637,19 @@ msgstr "Promijeni zakazani sastanak"
 
 #: calendar/gui/dialogs/comp-editor.c:882
 #: calendar/gui/dialogs/comp-editor.c:919
+#, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:885
 #: calendar/gui/dialogs/comp-editor.c:922
+#, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:888
 #: calendar/gui/dialogs/comp-editor.c:925
+#, c-format
 msgid "Journal entry - %s"
 msgstr "Stavka dnevnika - %s"
 
@@ -4623,8 +4659,8 @@ msgid "No summary"
 msgstr "Nema sažetka"
 
 #: calendar/gui/dialogs/comp-editor.c:1360
-#: calendar/gui/e-calendar-table.c:1190 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Spremi kao..."
 
@@ -4632,7 +4668,8 @@ msgstr "Spremi kao..."
 #: calendar/gui/dialogs/comp-editor.c:1487
 #: calendar/gui/dialogs/comp-editor.c:1513
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Izmjene učinjene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
+msgstr ""
+"Izmjene učinjene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
 
 #: calendar/gui/dialogs/comp-editor.c:1552
 msgid "Unable to use current version!"
@@ -4651,6 +4688,7 @@ msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
 #: calendar/gui/dialogs/delete-comp.c:95
+#, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
 
@@ -4659,6 +4697,7 @@ msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
 
 #: calendar/gui/dialogs/delete-comp.c:104
+#, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
 
@@ -4667,6 +4706,7 @@ msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni zadatak?"
 
 #: calendar/gui/dialogs/delete-comp.c:113
+#, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
 
@@ -4674,22 +4714,22 @@ msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sigurno želite izbrisati ovaj neimenovani unos u dnevnik?"
 
-#. plural form
 #: calendar/gui/dialogs/delete-comp.c:131
+#, c-format
 msgid "Are you sure you want to delete %d appointment?"
 msgid_plural "Are you sure you want to delete %d appointments?"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/dialogs/delete-comp.c:138
+#, c-format
 msgid "Are you sure you want to delete %d task?"
 msgid_plural "Are you sure you want to delete %d tasks?"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/dialogs/delete-comp.c:145
+#, c-format
 msgid "Are you sure you want to delete %d journal entry?"
 msgid_plural "Are you sure you want to delete %d journal entries?"
 msgstr[0] ""
@@ -4804,6 +4844,7 @@ msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
 #: calendar/gui/dialogs/event-page.c:1234
+#, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
@@ -4874,16 +4915,11 @@ msgid "_Start time:"
 msgstr "_Početno vrijeme:"
 
 #. 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:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: 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:443
@@ -5020,7 +5056,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Mijenjate povratni zadatak,što želite promijeniti?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Mijenjate povratni unos u dnevnik, što želite promijeniti?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -5041,7 +5078,8 @@ msgstr "Svi unosi"
 
 #: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
+msgstr ""
+"Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
 
 #: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
@@ -5120,7 +5158,7 @@ msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
 #: 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 "_Ukloni"
 
@@ -5162,7 +5200,7 @@ msgstr ""
 "\n"
 "Želite li spremiti izmjene?"
 
-#: 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 "_Zanemari promjene"
 
@@ -5177,7 +5215,7 @@ msgstr ""
 
 #. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
 #: calendar/gui/dialogs/select-source-dialog.c:69
-#, , c-format
+#, c-format
 msgid "Select destination %s"
 msgstr "Odaberite odredište %s"
 
@@ -5203,13 +5241,15 @@ msgstr "Informacija o primljenom zadatku je sačinjena. Poslati ju?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
-msgstr "Informacija o zadatku je promijenjena. Želite li poslati ažuriranu inačicu?"
+msgstr ""
+"Informacija o zadatku je promijenjena. Želite li poslati ažuriranu inačicu?"
 
 #: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
+#, no-c-format
 msgid "% _Complete"
 msgstr "% _ dovršeno"
 
@@ -5223,7 +5263,7 @@ msgstr "Završeno"
 
 #: 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 "Visok"
 
@@ -5236,13 +5276,13 @@ msgstr "Izvodi se"
 
 #: 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 "Nisko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "Obično"
 
@@ -5298,6 +5338,7 @@ msgid "Due date is before start date!"
 msgstr "Datum isteka je prije datuma početka!"
 
 #: calendar/gui/dialogs/task-page.c:810
+#, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
 
@@ -5371,36 +5412,36 @@ msgstr "Korisnik izdaje"
 msgid "Weekly"
 msgstr "Tjedno"
 
-#. plural form
 #: calendar/gui/e-alarm-list.c:395
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-alarm-list.c:400
+#, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-alarm-list.c:405
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-alarm-list.c:410
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-alarm-list.c:415
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
@@ -5441,10 +5482,12 @@ msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
 #: calendar/gui/e-alarm-list.c:521
+#, c-format
 msgid "%s at %s"
 msgstr "%s kod %s"
 
 #: calendar/gui/e-alarm-list.c:527
+#, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
@@ -5530,14 +5573,9 @@ msgstr "Ne"
 #: 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/imap4/camel-imap-engine.c:1525
-#: camel/providers/imap4/camel-imap-engine.c:1552
-#: camel/providers/imap4/camel-imap-engine.c:1582
-#: camel/providers/imap4/camel-imap-engine.c:1622
-#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
-#: 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 "Nepoznato"
 
@@ -5593,94 +5631,95 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:698 calendar/gui/e-calendar-view.c:680
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:861 calendar/gui/e-calendar-view.c:781
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1382
+#: 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 "_Otvori"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Otvori _web stranicu"
 
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1316 calendar/gui/e-calendar-view.c:1388
+#: 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 "_Spremi Kao..."
 
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1082
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1317
-#: calendar/gui/e-calendar-view.c:1386 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: 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:23
+#: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Ispis..."
 
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: calendar/gui/e-calendar-view.c:1322 calendar/gui/e-calendar-view.c:1364
+#: 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 "I_zreži"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1362
-#: mail/em-folder-tree.c:2497 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
+#: 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 "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1080
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1324
-#: calendar/gui/e-calendar-view.c:1384 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
+#: 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 "_Zaljepi"
 
-#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Dodijeli zadatak"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Proslijedi kao iCalendar "
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Obilježi kao izvršeno "
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obilježi odabrane zadatke kao izvršene "
 
-#: 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 "_Obriši odabrane zadatke"
 
-#: calendar/gui/e-calendar-table.c:1368
+#: calendar/gui/e-calendar-table.c:1371
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Kliknite ovdje za dodavanje zadatka"
 
 #: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
 msgid "% Complete"
 msgstr "% gotovo"
 
 #: 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:597
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "Završi"
 
@@ -5704,86 +5743,88 @@ msgstr "Datum početka"
 msgid "Task sort"
 msgstr "Razvrstani zadaci"
 
-#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1374
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-calendar-view.c:1288 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1289 calendar/gui/e-calendar-view.c:1378
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-calendar-view.c:1304 calendar/gui/e-calendar-view.c:1370
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "_Idi na Danas"
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Odaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1305 calendar/gui/e-calendar-view.c:1372
-msgid "_Go to Date..."
-msgstr "_Idi na datum..."
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Obriši..."
 
-#: calendar/gui/e-calendar-view.c:1309 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1274
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1275
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Premjesti u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1330
+#: calendar/gui/e-calendar-view.c:1276
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1277
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1390 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "_Idi na Danas"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Idi na datum..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Postavke..."
 
 #. 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 %m/%d/%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"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #: calendar/gui/e-cell-date-edit-text.c:125
+#, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "\n"
@@ -5794,38 +5835,32 @@ msgstr ""
 "%s"
 
 #: calendar/gui/e-day-view-time-item.c:532
+#, c-format
 msgid "%02i minute divisions"
 msgstr "razmaci od %02i minuta"
 
 #. 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:1572
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c: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:1605
+#. Don't use any other specifiers.
+#: 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:822 calendar/gui/e-week-view.c:593
+#: 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:825 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5834,22 +5869,22 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povratak)"
 
-#. plural form
 #: calendar/gui/e-itip-control.c:602
+#, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-itip-control.c:607
+#, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-itip-control.c:609
+#, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
@@ -5860,29 +5895,31 @@ msgid " and "
 msgstr " i"
 
 #: calendar/gui/e-itip-control.c:624
+#, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
 #: calendar/gui/e-itip-control.c:637
+#, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#. plural form
 #: calendar/gui/e-itip-control.c:644
+#, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-itip-control.c:648
+#, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: calendar/gui/e-itip-control.c:659
+#, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
@@ -5922,11 +5959,13 @@ msgstr "Greška iCalendara"
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr "<br> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
+msgstr ""
+"<br> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
 
 #: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
@@ -5999,12 +6038,13 @@ msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
 #: calendar/gui/e-itip-control.c:1186
+#, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
@@ -6013,10 +6053,12 @@ msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
 #: 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> traži da %s bude prisutan na sastanku."
 
 #: calendar/gui/e-itip-control.c:1194
+#, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
@@ -6025,6 +6067,7 @@ msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
 #: calendar/gui/e-itip-control.c:1199
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
@@ -6033,6 +6076,7 @@ msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
 #: calendar/gui/e-itip-control.c:1204
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
@@ -6041,6 +6085,7 @@ msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
 #: calendar/gui/e-itip-control.c:1212
+#, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
@@ -6049,6 +6094,7 @@ msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
 #: calendar/gui/e-itip-control.c:1220
+#, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
@@ -6058,6 +6104,7 @@ msgstr "Otkaz sastanka"
 
 #: 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> je poslao nerazumljivu poruku."
 
@@ -6066,6 +6113,7 @@ msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
 #: calendar/gui/e-itip-control.c:1254
+#, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
@@ -6074,10 +6122,12 @@ msgid "Task Information"
 msgstr "Informacija o zadatku"
 
 #: calendar/gui/e-itip-control.c:1260
+#, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži obavljanje zadatka od %s."
 
 #: calendar/gui/e-itip-control.c:1262
+#, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
@@ -6086,6 +6136,7 @@ msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
 #: calendar/gui/e-itip-control.c:1267
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
@@ -6094,6 +6145,7 @@ msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
 #: calendar/gui/e-itip-control.c:1272
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
@@ -6102,6 +6154,7 @@ msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
 #: calendar/gui/e-itip-control.c:1280
+#, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
@@ -6110,6 +6163,7 @@ msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
 #: calendar/gui/e-itip-control.c:1288
+#, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
@@ -6122,6 +6176,7 @@ msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
 #: calendar/gui/e-itip-control.c:1316
+#, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
@@ -6130,6 +6185,7 @@ msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
 #: calendar/gui/e-itip-control.c:1321
+#, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
@@ -6138,6 +6194,7 @@ msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
 #: calendar/gui/e-itip-control.c:1326
+#, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
@@ -6187,7 +6244,8 @@ msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
 
 #: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
+msgstr ""
+"Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
 
 #: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
@@ -6335,18 +6393,14 @@ msgid "In Process"
 msgstr "U toku"
 
 #. This is a strftime() format string %A = full weekday name,
-#.  %B = full month name, %d = month day, %Y = full year.
+#. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
 #: calendar/gui/e-meeting-time-sel.c:2060
 msgid "%A, %B %d, %Y"
 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.
+#. name, %m = month number, %d = month day, %Y = full year.
 #: 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
@@ -6354,11 +6408,7 @@ msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%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).
+#. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6442,12 +6492,13 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Internet stranica"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
+#, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
@@ -6457,7 +6508,7 @@ msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
 #: calendar/gui/e-tasks.c:792
-#, c-format
+#, c-format
 msgid ""
 "The task backend for\n"
 "%s\n"
@@ -6468,11 +6519,12 @@ msgstr ""
 " je prestala raditi."
 
 #: calendar/gui/e-tasks.c:872
+#, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
 #: calendar/gui/e-tasks.c:893
-#, , c-format
+#, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
@@ -6496,29 +6548,32 @@ msgstr "Brišem odabrane objekte..."
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1758
-#, , c-format
+#: calendar/gui/gnome-cal.c:1760
+#, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam sastanke kod %s"
 
-#: calendar/gui/gnome-cal.c:1777
-#, , c-format
+#: calendar/gui/gnome-cal.c:1779
+#, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zadatke kod %s"
 
-#: calendar/gui/gnome-cal.c:1797
+#: calendar/gui/gnome-cal.c:1799
+#, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:1926
+#: calendar/gui/gnome-cal.c:1928
+#, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2752
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -6539,44 +6594,46 @@ msgid "February"
 msgstr "Veljača"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Idi na datum"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Siječanj"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Srpanj"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Lipanj"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Ožujak"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Svibanj"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Studeni"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Listopad"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Odaberi sav tekst"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Rujan"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Idi na danas"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Izaberite direktorij"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6620,6 +6677,7 @@ msgid "Counter-proposal"
 msgstr "Kontra-prijedlog"
 
 #: calendar/gui/itip-utils.c:521
+#, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodan/zauzet informacija (%s do %s)"
 
@@ -6632,7 +6690,7 @@ msgid "You must be an attendee of the event."
 msgstr "Morate biti sudionik događaja"
 
 #: calendar/gui/itip-utils.c:1157
-#, , c-format
+#, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za %s"
 
@@ -6643,7 +6701,8 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija i hijerarhija Evolution zadatak je promjenjena u odnosu na Evolution 1.x.\n"
+"Lokacija i hijerarhija Evolution zadatak je promjenjena u odnosu na "
+"Evolution 1.x.\n"
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
@@ -6654,7 +6713,8 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija i hijerarhija Evolution kalendara je promjenjena u odnosu na Evolution 1.x.\n"
+"Lokacija i hijerarhija Evolution kalendara je promjenjena u odnosu na "
+"Evolution 1.x.\n"
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
@@ -6663,7 +6723,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i obljetnice"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "Na webu"
 
@@ -6838,6 +6898,7 @@ msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 #: calendar/gui/print.c:1951
+#, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Odabrani tjedan (%s - %s)"
 
@@ -6856,14 +6917,17 @@ msgid "Task"
 msgstr "Zadatak"
 
 #: calendar/gui/print.c:2356
+#, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
 #: calendar/gui/print.c:2373
+#, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s "
 
 #: calendar/gui/print.c:2385
+#, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
@@ -6873,6 +6937,7 @@ msgid "URL: %s"
 msgstr "URL: %s"
 
 #: calendar/gui/print.c:2411
+#, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
@@ -6894,38 +6959,42 @@ msgid "Print Setup"
 msgstr "Podešavanje ispisa"
 
 #: calendar/gui/tasks-component.c:302
+#, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr "Popis zadataka '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
+msgstr ""
+"Popis zadataka '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Novi popis zadataka"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Lista zadataka"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Stvori novi popis zadataka"
 
-#: 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 "Nije moguće otvoriti listu zadataka '%s' fa kreiranje događaja i sastanaka"
+msgstr ""
+"Nije moguće otvoriti listu zadataka '%s' fa kreiranje događaja i sastanaka"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za stvaranje zadataka"
 
@@ -6934,6 +7003,7 @@ msgid "The URI of the tasks folder to display"
 msgstr "URI za prikaz direktorija zadataka"
 
 #: calendar/gui/tasks-control.c:211
+#, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne mogu učitati poslove u `%s"
 
@@ -6944,8 +7014,8 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ova operacija će trajno obrisati sve zadatke označene kao završene."
-"Jednom obrisani, ti zadaci ne mogu biti vraćeni.\n"
+"Ova operacija će trajno obrisati sve zadatke označene kao završene.Jednom "
+"obrisani, ti zadaci ne mogu biti vraćeni.\n"
 "\n"
 "Jeste li sigurni da želite obrisati zadatke?"
 
@@ -7005,9 +7075,11 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
+#.
 #. * These are the timezone names from the Olson timezone data.
-#.  * We only place them here so gettext picks them up for translation.
-#.  * Don't include in any C files.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
 #: calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
@@ -8561,10 +8633,12 @@ msgid "Unable to create cache path"
 msgstr "Nisam mogao napraviti putanju za skrivenu memoriju"
 
 #: camel/camel-data-cache.c:375
+#, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nisam mogao ukloniti cache unos: %s: %s"
 
 #: camel/camel-disco-diary.c:194
+#, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
@@ -8575,6 +8649,7 @@ msgstr ""
 "se budete ponovo povezali na mrežu."
 
 #: camel/camel-disco-diary.c:257
+#, c-format
 msgid ""
 "Could not open `%s':\n"
 "%s\n"
@@ -8597,6 +8672,7 @@ msgid "Downloading new messages for offline mode"
 msgstr "Skidanje novih poruka za neumreženi način rada"
 
 #: camel/camel-disco-folder.c:441
+#, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam mapu '%s' za neumreženi rad"
 
@@ -8606,15 +8682,18 @@ msgstr "Morate biti na mreži da biste završili ovu operaciju"
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
+#, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neuspjelo stvaranje veze ka '%s': %s"
 
 #: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
+#, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neuspjelo stvaranje sadržanog procesa '%s': %s"
 
 #: camel/camel-filter-driver.c:754
+#, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
@@ -8623,10 +8702,12 @@ msgid "Syncing folders"
 msgstr "Sinkroniziram mape"
 
 #: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Greška kod čitanja filtera: %s: %s"
 
 #: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Greška kod primjene filtera: %s: %s"
 
@@ -8639,6 +8720,7 @@ msgid "Unable to process spool folder"
 msgstr "Nisam mogao da prođem kroz mapu sa redom"
 
 #: camel/camel-filter-driver.c:1132
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
@@ -8647,6 +8729,7 @@ msgid "Cannot open message"
 msgstr "Ne mogu otvoriti poruku"
 
 #: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
@@ -8655,10 +8738,12 @@ msgid "Syncing folder"
 msgstr "Sinkroniziram mapu"
 
 #: camel/camel-filter-driver.c:1224
+#, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
 #: camel/camel-filter-driver.c:1239
+#, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
 
@@ -8675,10 +8760,12 @@ msgid "Invalid arguments to (user-tag)"
 msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 
 #: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primjene filtera pretrage: %s: %s"
 
 #: camel/camel-folder-search.c:348
+#, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
@@ -8687,6 +8774,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-folder-search.c:358
+#, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
@@ -8699,18 +8787,22 @@ msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
 
 #: camel/camel-folder-search.c:650
+#, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
 
 #: camel/camel-folder.c:586
+#, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodržana operacija: priključena poruka: za %s"
 
 #: camel/camel-folder.c:1177
+#, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
 #: camel/camel-folder.c:1217
+#, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
 
@@ -8731,6 +8823,7 @@ msgid "Filtering new message(s)"
 msgstr "Filtriranje novih poruka"
 
 #: camel/camel-gpg-context.c:710
+#, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
@@ -8749,6 +8842,7 @@ msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
 
 #: camel/camel-gpg-context.c:762
+#, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
@@ -8759,7 +8853,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "Poništeno."
 
@@ -8768,6 +8862,7 @@ msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao otključati tajni ključ: date su 3 pogrešne lozinke."
 
 #: camel/camel-gpg-context.c:803
+#, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
@@ -8776,6 +8871,7 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji. "
 
 #: camel/camel-gpg-context.c:1124
+#, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
@@ -8786,15 +8882,18 @@ msgstr ""
 "%s"
 
 #: camel/camel-gpg-context.c:1129
+#, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao primjeniti GPG %s: %s\n"
 
 #: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
+#, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ne mogu stvoriti podatke za potpis: %s"
 
 #: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
 #: camel/camel-gpg-context.c:1715
+#, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao izvršiti gpg: %s"
 
@@ -8816,10 +8915,13 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
 
 #: camel/camel-gpg-context.c:1397
+#, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
+msgstr ""
+"Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
 
 #: camel/camel-gpg-context.c:1484
+#, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
 
@@ -8836,63 +8938,79 @@ msgid "Unable to parse message content"
 msgstr "Nije moguća analiza sadržaja poruke"
 
 #: camel/camel-lock-client.c:100
+#, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
 
 #: camel/camel-lock-client.c:113
+#, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ne mogu podijeliti pomoćnika zaključavanja: %s"
 
 #: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
 
 #: camel/camel-lock-client.c:204
+#, c-format
 msgid "Could not lock '%s'"
 msgstr "Ne mogu zaključati '%s"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisam mogao zaključati datoteku za %s: %s"
 
 #: camel/camel-lock.c:154
+#, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr """Isteklo je vrijeme kod pokušaja pribavljanja zaključane datoteke na %s. Pokušajte "
-"kasnije."
+msgstr ""
+"Isteklo je vrijeme kod pokušaja pribavljanja zaključane datoteke na %s. "
+"Pokušajte kasnije."
 
 #: camel/camel-lock.c:209
+#, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisam mogao zaključiti koristeći fcntl(2): %s"
 
 #: camel/camel-lock.c:272
+#, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao zaključiti koristeći flock(2): %s "
 
 #: camel/camel-movemail.c:107
+#, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisam mogao provjeriti datoteku pošte %s: %s"
 
 #: camel/camel-movemail.c:120
+#, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisam mogao otvoriti datoteku pošte  %s: %s"
 
 #: camel/camel-movemail.c:128
+#, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisam mogao otvoriti privremenu datoteku pošte %s: %s"
 
 #: camel/camel-movemail.c:157
+#, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisam mogao smijestiti poštu u temp datoteku %s: %s"
 
 #: camel/camel-movemail.c:187
+#, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisam mogao napraviti cjevovod: %s"
 
 #: camel/camel-movemail.c:199
+#, c-format
 msgid "Could not fork: %s"
 msgstr "Ne mogu forkati: %s"
 
 #: camel/camel-movemail.c:237
+#, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program za premeštanje pošte nije uspio: %s"
 
@@ -8901,14 +9019,17 @@ msgid "(Unknown error)"
 msgstr "(Nepoznata greška)"
 
 #: camel/camel-movemail.c:261
+#, c-format
 msgid "Error reading mail file: %s"
 msgstr "Greška kod čitanja datoteke pošte: %s"
 
 #: camel/camel-movemail.c:272
+#, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Greška kod pisanja privremene datoteke: %s"
 
 #: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Greška kod kopiranja privremene datoteke: %s"
 
@@ -8933,18 +9054,22 @@ msgid "For reading mail as a query of another set of folders"
 msgstr "Za čitanje pošte kao upita drugog niza mapa"
 
 #: camel/camel-provider.c:172
+#, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ne mogu učitati %s: ovaj sustav ne podržava učitavanje modula."
 
 #: camel/camel-provider.c:181
+#, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne mogu učitati %s: %s"
 
 #: camel/camel-provider.c:189
+#, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu učitati %s: nema koda za pokretanje u modulu."
 
 #: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nema dostupnog ponuđača za protokol `%s'"
 
@@ -8961,6 +9086,7 @@ msgid "Authentication failed."
 msgstr "Neuspjelo spajanje."
 
 #: camel/camel-sasl-anonymous.c:121
+#, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -8969,6 +9095,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:133
+#, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -8977,6 +9104,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:145
+#, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
@@ -8992,7 +9120,9 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Spajanje na poslužitelj korištenjem lozinke kodirane CRAM-MD5 algoritmom, ako ga poslužitelj podržava."
+msgstr ""
+"Spajanje na poslužitelj korištenjem lozinke kodirane CRAM-MD5 algoritmom, "
+"ako ga poslužitelj podržava."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -9002,7 +9132,9 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Spajanje na poslužitelj korištenjem lozinke kodirane DIGEST-MD5 algoritmom, ako ga poslužitelj podržava."
+msgstr ""
+"Spajanje na poslužitelj korištenjem lozinke kodirane DIGEST-MD5 algoritmom, "
+"ako ga poslužitelj podržava."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9014,7 +9146,8 @@ msgstr "Upit na poslužitelj je neispravan\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Upit na poslužitelj sadrži neispravan token \"Kvaliteta zaštite\"unos\n"
+msgstr ""
+"Upit na poslužitelj sadrži neispravan token \"Kvaliteta zaštite\"unos\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9052,7 +9185,8 @@ msgstr "Ponuđeni parametar ime_cilja nije pravilno formiran."
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "Ponuđeni parametar ime_cilja je sadržao neispravan ili nepodržan tip imena."
+msgstr ""
+"Ponuđeni parametar ime_cilja je sadržao neispravan ili nepodržan tip imena."
 
 #: camel/camel-sasl-gssapi.c:160
 msgid ""
@@ -9066,7 +9200,9 @@ msgstr ""
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "input_token sadrži neispravnu strukturu, ili potpis nije mogao biti provjeren."
+msgstr ""
+"input_token sadrži neispravnu strukturu, ili potpis nije mogao biti "
+"provjeren."
 
 #: camel/camel-sasl-gssapi.c:169
 msgid ""
@@ -9095,11 +9231,12 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: 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:1198
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Neispravan odgovor autentifikacije od servera."
 
 #: camel/camel-sasl-gssapi.c:213
+#, c-format
 msgid "Failed to resolve host `%s': %s"
 msgstr "Nisam mogao pronaći domaćina `%s': %s"
 
@@ -9116,6 +9253,7 @@ msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Spajanje na poslužitelj korištenjem Kerberos 4 autentifikacije."
 
 #: camel/camel-sasl-kerberos4.c:162
+#, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
@@ -9143,7 +9281,9 @@ msgstr "NTLM / SPA"
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr "Spajanje na Windows poslužitelj korištenjem NTLM / Secure Password Authentication."
+msgstr ""
+"Spajanje na Windows poslužitelj korištenjem NTLM / Secure Password "
+"Authentication."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
@@ -9170,38 +9310,47 @@ msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP prije SMTP autorizacija korištenjem izvora koji nije pop"
 
 #: camel/camel-search-private.c:114
+#, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Neuspjela kompilacija regularnog izraza: %s: %s"
 
 #: camel/camel-service.c:275
+#, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s traži dio sa korisničkim imenom'"
 
 #: camel/camel-service.c:279
+#, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s traži dio sa imenom računala"
 
 #: camel/camel-service.c:283
+#, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' traži dio sa putanjom"
 
 #: camel/camel-service.c:733
+#, c-format
 msgid "Resolving: %s"
 msgstr "Razlučujem: %s"
 
 #: camel/camel-service.c:764 camel/camel-service.c:888
+#, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Greška kod pretrage za imenom: %s"
 
 #: camel/camel-service.c:785 camel/camel-service.c:909
+#, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Neuspjelo nalaženje domaćina: ne može stvoriti nit: %s"
 
 #: camel/camel-service.c:798
+#, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Neuspjelo nalaženje domaćina: %s: domaćin nije pronađen"
 
 #: camel/camel-service.c:801
+#, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: %s: nepoznat razlog"
 
@@ -9218,6 +9367,7 @@ msgid "Host lookup failed: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: nepoznat razlog"
 
 #: camel/camel-session.c:282
+#, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
@@ -9226,6 +9376,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-smime-context.c:104
+#, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Unesite sigurnosnu frazu za prolaz za `%s'"
 
@@ -9270,31 +9421,33 @@ msgid "Processing error"
 msgstr "Greška u obradi"
 
 #: camel/camel-smime-context.c:647
+#, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisao: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu dobiti mapu: neispravna operacija"
 
-#: camel/camel-store.c:242
-#, , c-format
+#: camel/camel-store.c:244
+#, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
 
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
-#: camel/camel-store.c:377 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 "Ne mogu obrisati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:773 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: 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"
@@ -9417,6 +9570,7 @@ msgid "Error in application verification"
 msgstr "Greška kod provjere programa"
 
 #: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#, c-format
 msgid ""
 "Issuer:            %s\n"
 "Subject:           %s\n"
@@ -9437,6 +9591,7 @@ msgid "BAD"
 msgstr "LOŠ"
 
 #: camel/camel-tcp-stream-openssl.c:704
+#, c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
@@ -9456,6 +9611,7 @@ msgstr ""
 
 #. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:841
+#, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
 "\n"
@@ -9470,6 +9626,7 @@ msgstr ""
 "Želite li prihvatiti?"
 
 #: camel/camel-tcp-stream-ssl.c:885
+#, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
@@ -9478,6 +9635,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:937
+#, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
@@ -9486,6 +9644,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:955
+#, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
@@ -9494,6 +9653,7 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-tcp-stream-ssl.c:972
+#, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
@@ -9502,14 +9662,17 @@ msgstr ""
 "Izdavač: %s"
 
 #: camel/camel-url.c:290
+#, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao obraditi URL `%s"
 
 #: camel/camel-vee-folder.c:611
+#, c-format
 msgid "Error storing `%s': %s"
 msgstr "Greška kod spremanja `%s': %s"
 
 #: camel/camel-vee-folder.c:649
+#, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke %s u %s"
 
@@ -9518,14 +9681,17 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
 #: camel/camel-vee-store.c:368
+#, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
 #: camel/camel-vee-store.c:381
+#, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 
 #: camel/camel-vee-store.c:389
+#, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
 
@@ -9594,17 +9760,19 @@ msgstr "Kontrolni popis"
 #: 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:2902
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2905
+#: camel/providers/imap/camel-imap-store.c:3027
+#, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
 
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
+#, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
@@ -9613,10 +9781,12 @@ msgstr ""
 "%s"
 
 #: camel/providers/imap/camel-imap-command.c:389
+#, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
 
 #: camel/providers/imap/camel-imap-command.c:399
+#, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP naredba nije uspjela: %s"
 
@@ -9625,18 +9795,22 @@ msgid "Server response ended too soon."
 msgstr "Odgovor poslužitelja je prerano završen."
 
 #: camel/providers/imap/camel-imap-command.c:649
+#, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor IMAP poslužitelja ne sadrži %s informaciju"
 
 #: camel/providers/imap/camel-imap-command.c:685
+#, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočekivan OK odgovor od IMAP poslužitelja: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:223
+#, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne mogu kreirati mapu %s: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:242
+#, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne mogu učitati sažetak za %s"
 
@@ -9650,6 +9824,7 @@ msgid "Scanning for changed messages"
 msgstr "Tragam za promijenjenim porukama"
 
 #: camel/providers/imap/camel-imap-folder.c:1924
+#, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
@@ -9661,6 +9836,7 @@ msgstr "Ne mogu da pokupim poruku: %s"
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
+#, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
@@ -9691,6 +9867,7 @@ msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao pronaći tekst poruke u FETCH odgovoru."
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nisam mogao otvoriti direktorij za pričuvnu memoriju: %s"
 
@@ -9698,10 +9875,12 @@ msgstr "Nisam mogao otvoriti direktorij za pričuvnu memoriju: %s"
 #: camel/providers/imap/camel-imap-message-cache.c:309
 #: camel/providers/imap/camel-imap-message-cache.c:340
 #: camel/providers/imap/camel-imap-message-cache.c:372
+#, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisam uspio privremeno sačuvati poruku %s: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:417
+#, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Nisam uspio privremeno sačuvati %s: %s"
 
@@ -9740,7 +9919,9 @@ msgstr "Primjeni filtere na nove poruke u INBOXu ovog servera"
 
 #: camel/providers/imap/camel-imap-provider.c:66
 msgid "Check new messages for Junk contents"
-msgstr "Provjeri nove poruke da li u se njima nalazi sadržaj koji je proglašen smećem."
+msgstr ""
+"Provjeri nove poruke da li u se njima nalazi sadržaj koji je proglašen "
+"smećem."
 
 #: camel/providers/imap/camel-imap-provider.c:68
 msgid "Only check for Junk messages in the INBOX folder"
@@ -9754,38 +9935,35 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i spremanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-store.c:425
-#: camel/providers/imap4/camel-imap-store.c:166
+#: camel/providers/imap/camel-imap-store.c:424
+#, c-format
 msgid "IMAP server %s"
 msgstr "IMAP poslužitelj %s"
 
-#: camel/providers/imap/camel-imap-store.c:427
-#: camel/providers/imap4/camel-imap-store.c:168
+#: camel/providers/imap/camel-imap-store.c:426
+#, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap-store.c:209
-#: camel/providers/imap4/camel-imap-store.c:226
+#: 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
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisam se mogao povezati na %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap-store.c:211
+#: 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 nedostupan"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:801
-#: camel/providers/imap4/camel-imap-store.c:223
+#: 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
@@ -9793,45 +9971,51 @@ msgstr "SSL nedostupan"
 msgid "Connection cancelled"
 msgstr "Povezivanje poništeno"
 
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/imap4/camel-imap-store.c:287
+#: 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 "Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
+msgstr ""
+"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
 
-#: camel/providers/imap/camel-imap-store.c:636
+#: 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 dodatak nije podržan."
 
-#: camel/providers/imap/camel-imap-store.c:667
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
-#: camel/providers/imap/camel-imap-store.c:804
+#: camel/providers/imap/camel-imap-store.c:803
+#, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu se spojiti s naredbom \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1228
+#: camel/providers/imap/camel-imap-store.c:1227
+#, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP poslužitelj %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1238
+#: 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 "Nema podrške za tip autentifikacije  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: 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 "%sMolim unesite IMAP zaporku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1304
+#: camel/providers/imap/camel-imap-store.c:1303
+#, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
@@ -9841,120 +10025,36 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1723
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
+#, c-format
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1734
-#: camel/providers/imap/camel-imap-store.c:2023
-#: camel/providers/imap4/camel-imap-store.c:636
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+#: 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 "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1758
+#: 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
-#, , c-format
+#, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2035
+#: camel/providers/imap/camel-imap-store.c:2102
+#, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2071
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorij ne smije sadržati direktorije "
 
-#: camel/providers/imap4/camel-imap-command.c:629
-msgid "Unexpected response from IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-engine.c:411
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-engine.c:417
-msgid "Cannot select folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-engine.c:1135
-#: camel/providers/imap4/camel-imap-engine.c:1524
-#: camel/providers/imap4/camel-imap-engine.c:1551
-#: camel/providers/imap4/camel-imap-engine.c:1581
-#: camel/providers/imap4/camel-imap-engine.c:1621
-#: camel/providers/imap4/camel-imap-utils.c:289
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-engine.c:1136
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:262
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:374
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:419
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:493
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:672
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:677
-msgid "Cannot create folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:699
-msgid "Cannot delete folder `%s': Special folder"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:728
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:733
-msgid "Cannot delete folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:791
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:796
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:835
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-store.c:840
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-utils.c:83
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: camel/providers/imap4/camel-imap-utils.c:106
-msgid "No data"
-msgstr ""
-
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -9972,11 +10072,13 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "Experimentalni IMAP 4(.1) klijent\n"
-"Ovo je neisprobani i nepodržani kod, možda biste ipak željeli koristiti obični imap.\n"
+"Ovo je neisprobani i nepodržani kod, možda biste ipak željeli koristiti "
+"obični imap.\n"
 "\n"
 " !!! NEMOJTE OVO KORISTITI ZA OZBILNU UPORABU !!!\n"
 
 #: camel/providers/imapp/camel-imapp-store.c:328
+#, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ne mogu se spojiti na POP poslužitelj na %s "
 
@@ -9985,18 +10087,21 @@ msgid "Index message body data"
 msgstr "Indeksiranje sadržaja poruka"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: 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:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
+#, c-format
 msgid "mailbox:%s (%s)"
 msgstr "sandučić:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
+#, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
@@ -10021,8 +10126,8 @@ msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
 msgstr ""
-"Za preuzimanje (premještanje) lokalne pošte iz mbox formata u mape "
-"kojima upravlja Evolution."
+"Za preuzimanje (premještanje) lokalne pošte iz mbox formata u mape kojima "
+"upravlja Evolution."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -10059,16 +10164,19 @@ msgstr ""
 #: camel/providers/local/camel-local-store.c:215
 #: 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"
 msgstr "Spremnik root %s nije apsolutna putanja"
 
 #: camel/providers/local/camel-local-store.c:145
+#, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Spremnik root %s nije regularan direktorij"
 
 #: camel/providers/local/camel-local-store.c:154
 #: camel/providers/local/camel-local-store.c:162
 #: camel/providers/local/camel-local-store.c:226
+#, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne mogu dobiti mapu: %s: %s"
 
@@ -10077,33 +10185,40 @@ msgid "Local stores do not have an inbox"
 msgstr "Lokalna spremišta ne sadrže sandučić za poštu."
 
 #: camel/providers/local/camel-local-store.c:186
+#, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
 #: camel/providers/local/camel-local-store.c:295
+#, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisam mogao preimenovati direktorij %s u %s: %s"
 
 #: camel/providers/local/camel-local-store.c:360
+#, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
 #: camel/providers/local/camel-local-store.c:385
 #: camel/providers/local/camel-mbox-store.c:284
+#, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisam mogao obrisati datoteku sažetka mape `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:395
 #: camel/providers/local/camel-mbox-store.c:296
+#, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisam mogao obrisati indeks datoteku mape `%s': %s"
 
 #: 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 "Ne mogu obrisati meta datoteku mape: `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:405
+#, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisam mogao sačuvati sažetak: %s: %s"
 
@@ -10116,6 +10231,7 @@ msgid "Maildir append message cancelled"
 msgstr "Dodata Maildir poruka otkazana"
 
 #: camel/providers/local/camel-maildir-folder.c:186
+#, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu dodati poruku u maildir mapu: %s: %s"
 
@@ -10127,32 +10243,33 @@ msgstr "Neispravan sadržaj poruke"
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
-#, , c-format
+#, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ne mogu dohvatiti mapu: `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
-#, , c-format
+#, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
 
 #: camel/providers/local/camel-maildir-store.c:119
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
-#, , c-format
+#, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:134
-#, , c-format
+#, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Ne mogu dohvatiti mapu `%s': nije maildir direktorij."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
 #: camel/providers/local/camel-mh-store.c:260
+#, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao obrisati direktorij `%s': %s"
 
@@ -10163,11 +10280,13 @@ msgstr "nije maildir direktorij"
 #: 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 "Nisam mogao skenirati direktorij `%s': %s"
 
 #: 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 "Ne mogu otvoriti putanju maildir direktorija: %s: %s"
 
@@ -10189,10 +10308,12 @@ msgstr "Smiještam direktorij"
 
 #: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
+#, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne mogu zaključati  mapu %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:284
+#, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne mogu otvoriti sandučić: %s: %s\n"
 
@@ -10201,12 +10322,14 @@ msgid "Mail append cancelled"
 msgstr "Dodavanje pošte otkazano"
 
 #: camel/providers/local/camel-mbox-folder.c:347
+#, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne mogu dodati poruku u mbox datoteku: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:435
 #: camel/providers/local/camel-mbox-folder.c:466
 #: camel/providers/local/camel-mbox-folder.c:474
+#, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
@@ -10228,13 +10351,14 @@ msgid "Cannot create a folder by this name."
 msgstr "Ne mogu stvoriti mapu s ovim imenom."
 
 #: camel/providers/local/camel-mbox-store.c:206
-#, , c-format
+#, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr "Ne mogu dohvatiti mapu `%s': nije obična datoteka"
 
 #: camel/providers/local/camel-mbox-store.c:236
 #: camel/providers/local/camel-mbox-store.c:247
 #: camel/providers/local/camel-mbox-store.c:270
+#, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
@@ -10243,18 +10367,22 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:255
+#, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nije regularna datoteka."
 
 #: camel/providers/local/camel-mbox-store.c:262
+#, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' nije prazna. Nije obrisana."
 
 #: camel/providers/local/camel-mbox-store.c:375
+#, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
 #: camel/providers/local/camel-mbox-store.c:389
+#, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu stvoriti mapu: %s: %s"
 
@@ -10267,48 +10395,56 @@ msgid "The new folder name is illegal."
 msgstr "Ime nove mape je neispravno."
 
 #: camel/providers/local/camel-mbox-store.c:486
-#, , c-format
+#, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ne mogu preimenovati `%s': `%s': %s"
 
 #: camel/providers/local/camel-mbox-store.c:561
-#, , c-format
+#, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ne mogu preimenovati  '%s' u %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:375
+#, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisam mogao otvoriti direktorij: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:423
+#, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatalna greška u obradi pošte na poziciji %ld u direktoriju %s"
 
 #: camel/providers/local/camel-mbox-summary.c:479
+#, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu provjeriti mapu: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:547
 #: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
+#, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisam mogao otvoriti datoteku: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
+#, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne mogu otvoriti privremeni sandučić: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:572
 #: camel/providers/local/camel-mbox-summary.c:736
+#, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisam mogao zatvoriti izvornu mapu%s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:581
+#, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisam mogao zatvoriti temp mapu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
+#, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao preimenovati direktorij: %s"
 
@@ -10321,19 +10457,23 @@ msgstr "Neslaganje sažetka i direktorija, čak i nakon sinhronizacije"
 
 #: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
+#, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greška: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:846
+#, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisam mogao spremiti direktorij: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:940
 #: camel/providers/local/camel-mbox-summary.c:966
+#, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Greška kod pisanja u privremeni pretinac: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:957
+#, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje u tmp poštanskog pretinca neuspjelo: %s: %s"
 
@@ -10342,36 +10482,42 @@ msgid "MH append message cancelled"
 msgstr "MH dodaja poruke otkazana"
 
 #: camel/providers/local/camel-mh-folder.c:177
+#, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:219
-#, , c-format
+#, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "Nisam mogao napraviti mapu `%s':%s"
 
 #: camel/providers/local/camel-mh-store.c:231
-#, , c-format
+#, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Ne mogu dohvatiti mapu: %s: nije direktorij."
 
 #: camel/providers/local/camel-mh-summary.c:244
+#, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne mogu otvoriti putanju MH direktorija: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:122
+#, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool `%s' se ne može otvoriti: %s"
 
 #: camel/providers/local/camel-spool-store.c:134
+#, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spool `%s' nije regularna datoteka ili direktorij"
 
 #: camel/providers/local/camel-spool-store.c:153
+#, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne postoji."
 
 #: camel/providers/local/camel-spool-store.c:163
+#, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
@@ -10380,10 +10526,12 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-spool-store.c:167
+#, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne postoji."
 
 #: camel/providers/local/camel-spool-store.c:172
+#, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
@@ -10392,6 +10540,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-spool-store.c:180
+#, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' nije mailbox datoteka."
 
@@ -10400,10 +10549,12 @@ msgid "Store does not support an INBOX"
 msgstr "Spremnik ne podržava INBOX"
 
 #: camel/providers/local/camel-spool-store.c:209
+#, c-format
 msgid "Spool mail file %s"
 msgstr "Spool datoteka pošte %s"
 
 #: camel/providers/local/camel-spool-store.c:209
+#, c-format
 msgid "Spool folder tree %s"
 msgstr "Lista spool direktorija %s"
 
@@ -10418,16 +10569,19 @@ msgstr "Spool direktoriji se ne mogu brisati"
 #: camel/providers/local/camel-spool-summary.c:175
 #: camel/providers/local/camel-spool-summary.c:185
 #: camel/providers/local/camel-spool-summary.c:195
+#, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nisam mogao sinkronizirati privremenu mapu %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:211
+#, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nisam mogao sinhronizirati spool direktorij %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:242
 #: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
+#, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
@@ -10437,6 +10591,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
 #: camel/providers/nntp/camel-nntp-store.c:997
+#, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Molim unesite NNTP lozinku za %s@%s"
 
@@ -10468,16 +10623,18 @@ msgstr "Korisnik poništen"
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
 #: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu dobiti poruku %s: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:195
+#, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Interna greška: uid je u neispravnom formatu: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#, , c-format
+#, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Ne mogu dohvatiti članak %s s NNTP poslužitelja"
 
@@ -10501,7 +10658,7 @@ msgid "Error reading response to posted message: message not posted"
 msgstr "Greška pri čitanju odgovora na poslanu poruku: poruka nije poslana"
 
 #: camel/providers/nntp/camel-nntp-folder.c:432
-#, , c-format
+#, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Greška prilikom slanja poruke: %s: poruka nije poslana"
 
@@ -10519,16 +10676,20 @@ msgstr "Ne mogu dohvatiti popis grupa sa poslužitelja."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:98
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nije se mogla učitati datoteka sa listom grupa za %s: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nije se mogla snimiti datoteka sa listom grupa za %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Prikaži mape u skraćenom obliku (npr. h.c.o.linux umjesto hr.comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Prikaži mape u skraćenom obliku (npr. h.c.o.linux umjesto hr.comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -10549,14 +10710,17 @@ msgid ""
 msgstr "Prijava na NNTP server korištenjem lozinke u čistom tekstu."
 
 #: camel/providers/nntp/camel-nntp-store.c:158
+#, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nisam mogao pročitati pozdrav od %s: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:170
+#, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:326
+#, c-format
 msgid "USENET News via %s"
 msgstr "USENET vijesti preko %s"
 
@@ -10565,7 +10729,7 @@ msgid "Stream error"
 msgstr "Greška u nizu podataka"
 
 #: camel/providers/nntp/camel-nntp-store.c:643
-#, , c-format
+#, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
@@ -10597,7 +10761,9 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Ne možete stvoriti mapu u pohrani USENET poruka: umjesto toga otkažite pretplatu."
+msgstr ""
+"Ne možete stvoriti mapu u pohrani USENET poruka: umjesto toga otkažite "
+"pretplatu."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
 msgid "You cannot rename a folder in a News store."
@@ -10605,18 +10771,22 @@ msgstr "Ne možete ukloniti mapu u spremištu USENET poruka."
 
 #: camel/providers/nntp/camel-nntp-store.c:808
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu umjesto toga."
+msgstr ""
+"Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu "
+"umjesto toga."
 
 #: camel/providers/nntp/camel-nntp-summary.c:253
-#, , c-format
+#, c-format
 msgid "Connection error: %s"
 msgstr "Greška u spajanju: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:262
+#, c-format
 msgid "No such folder: %s"
 msgstr "Nema takve mape: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:268
+#, c-format
 msgid "Could not get group: %s"
 msgstr "Ne mogu dobiti grupu: %s"
 
@@ -10625,15 +10795,18 @@ msgid "Could not get messages: unspecificed error"
 msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
+#, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komanda nije uspjela: %s"
 
 #: 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: Tražim nove poruke"
 
 #: camel/providers/nntp/camel-nntp-summary.c:558
+#, c-format
 msgid "Unknown server response: %s"
 msgstr "Nepoznat odgovor poslužitelja: %s"
 
@@ -10642,6 +10815,7 @@ msgid "Use cancel"
 msgstr "Koristite poništi"
 
 #: camel/providers/nntp/camel-nntp-summary.c:607
+#, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
 
@@ -10650,6 +10824,7 @@ msgid "Retrieving POP summary"
 msgstr "Preuzimam POP sažetak"
 
 #: camel/providers/pop3/camel-pop3-folder.c:265
+#, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ne mogu dobiti POP sažetak: %s"
 
@@ -10658,12 +10833,14 @@ msgid "Expunging deleted messages"
 msgstr "Nepročitana poruka"
 
 #: camel/providers/pop3/camel-pop3-folder.c:404
+#, c-format
 msgid "No message with uid %s"
 msgstr "Nema poruka sa uid-om %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
-#.  returns the proper exception code.  Sigh.
+#. returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:411
+#, c-format
 msgid "Retrieving POP message %d"
 msgstr "Preuzimam POP poruke (%d)"
 
@@ -10676,6 +10853,7 @@ msgid "Leave messages on server"
 msgstr "Ostavi poruke na serveru"
 
 #: camel/providers/pop3/camel-pop3-provider.c:43
+#, c-format
 msgid "Delete after %s day(s)"
 msgstr "Obriši nakon %s dana"
 
@@ -10695,7 +10873,9 @@ msgstr "Za povezivanje i preuzimanje pošte sa POP servera."
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
-msgstr "Spajanje na POP poslužitelj korištenjem lozinke u čistim tekstom. Ovo je jedini način prijenosa kojeg podržavaju mnogi POP poslužitelji."
+msgstr ""
+"Spajanje na POP poslužitelj korištenjem lozinke u čistim tekstom. Ovo je "
+"jedini način prijenosa kojeg podržavaju mnogi POP poslužitelji."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
@@ -10703,51 +10883,60 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"Spajanje na POP poslužitelj korištenjem enkriptirane lozinke preko APOP protokola."
-"Možda neće raditi svim korisnicima, čak i sa poslužiteljma koji tvrde da to podržavaju."
+"Spajanje na POP poslužitelj korištenjem enkriptirane lozinke preko APOP "
+"protokola.Možda neće raditi svim korisnicima, čak i sa poslužiteljma koji "
+"tvrde da to podržavaju."
 
 #: camel/providers/pop3/camel-pop3-store.c:195
+#, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nisam se mogao povezati na POP server %s (port %d): %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:227
 #: camel/providers/pop3/camel-pop3-store.c:256
 #: camel/providers/pop3/camel-pop3-store.c:268
+#, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam se mogao povezati na POP server %s u sigurnosnom načinu rada: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:366
+#, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nisam se mogao povezati na POP server %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
+#, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
-"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave nije "
-"podržan."
+"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
+"nije podržan."
 
 #: camel/providers/pop3/camel-pop3-store.c:423
+#, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' prijava neuspela na POP poslužitelj %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:435
+#, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu se prijaviti na POP server %s: greška kod SASL protokola"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
+#, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nisam se mogao prijaviti na POP server %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:480
-#, c-format
+#, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sMolim, upišite POP lozinku za %s na računalu %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
@@ -10756,6 +10945,7 @@ msgstr ""
 "Greška kod slanja zaporke: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:641
+#, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
 
@@ -10768,33 +10958,40 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Za dostavu pošte prosljeđivanjem \"sendmail\" programu na lokalnom sustavu."
+msgstr ""
+"Za dostavu pošte prosljeđivanjem \"sendmail\" programu na lokalnom sustavu."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Nisam mogao obraditi popis primatelja"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
+#, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nisam mogao napraviti cjevovod na sendmail: %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
+#, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ne mogu forkati sendmail: %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
+#, c-format
 msgid "Could not send message: %s"
 msgstr "Nisam mogao poslati poruku: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:233
+#, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail je završio signalom %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:240
+#, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisam mogao izvršiti %s: poruka nije poslana"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
+#, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail je završio sa statusom %d: poruka nije poslana"
 
@@ -10920,15 +11117,17 @@ msgstr "Greška kod odgovora dobrodošlice"
 
 #: camel/providers/smtp/camel-smtp-transport.c:343
 #: camel/providers/smtp/camel-smtp-transport.c:382
+#, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Nisam se mogao povezati na SMTP server %s u sigurnosnom načinu rada: %s"
+msgstr ""
+"Nisam se mogao povezati na SMTP server %s u sigurnosnom načinu rada: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "čini se da poslužitelj ne podržava SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, , c-format
+#, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Greška kod izvršavanja naredbe STARTTLS: %s"
 
@@ -10937,15 +11136,17 @@ msgid "STARTTLS command failed"
 msgstr "Greška kod izvršavanja naredbe STARTTLS"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
+#, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP poslužitelj %s ne podržava traženi tip autorizacije (%s)."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
-#, c-format
+#, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sMolim, upišite SMTP lozinku za %s na računalu %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
+#, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
@@ -10956,10 +11157,12 @@ msgstr ""
 "\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
 msgid "SMTP server %s"
 msgstr "SMTP poslužitelj %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:668
+#, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava pošte preko %s"
 
@@ -10988,7 +11191,7 @@ msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
 #: camel/providers/smtp/camel-smtp-transport.c:943
-#, , c-format
+#, c-format
 msgid "HELO command failed: %s"
 msgstr "Greška kod izvršavanja naredbe HELO: %s"
 
@@ -11006,7 +11209,7 @@ msgstr "Greška kod stvaranja objekta SASL prijave."
 
 #: camel/providers/smtp/camel-smtp-transport.c:1049
 #: camel/providers/smtp/camel-smtp-transport.c:1060
-#, , c-format
+#, c-format
 msgid "AUTH command failed: %s"
 msgstr "Greška kod izvršavanja naredbe AUTH: %s"
 
@@ -11019,7 +11222,7 @@ msgid "Bad authentication response from server.\n"
 msgstr "Neispravan odgovor autentifikacije od servera.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1153
-#, , c-format
+#, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Greška kod izvršavanja naredbe MAIL FROM: %s: poruka nije poslana"
 
@@ -11028,30 +11231,32 @@ msgid "MAIL FROM command failed"
 msgstr "Greška kod izvršavanja naredbe MAIL FROM"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1194
-#, , c-format
+#, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Greška kod izvršavanja naredbe RCPT TO: %s: poruka nije poslana"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1213
+#, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> neuspelo"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:1310
 #: camel/providers/smtp/camel-smtp-transport.c:1329
-#, , c-format
+#, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Greška kod izvršavanja naredbe DATA: %s: poruka nije poslana"
 
 #. we should have gotten instructions on how to use the DATA command:
-#.  * 354 Enter mail, end with "." on a line by itself
+#. * 354 Enter mail, end with "." on a line by itself
+#.
 #: camel/providers/smtp/camel-smtp-transport.c:1269
 #: camel/providers/smtp/camel-smtp-transport.c:1345
 msgid "DATA command failed"
 msgstr "Greška kod izvršavanja naredbe DATA"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1368
-#, , c-format
+#, c-format
 msgid "RSET command failed: %s"
 msgstr "Greška kod izvršavanja naredbe RSET: %s"
 
@@ -11060,7 +11265,7 @@ msgid "RSET command failed"
 msgstr "Greška kod izvršavanja naredbe RSET"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1407
-#, , c-format
+#, c-format
 msgid "QUIT command failed: %s"
 msgstr "Greška kod izvršavanja naredbe QUIT: %s"
 
@@ -11068,40 +11273,45 @@ msgstr "Greška kod izvršavanja naredbe QUIT: %s"
 msgid "QUIT command failed"
 msgstr "Greška kod izvršavanja naredbe QUIT"
 
-#: 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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "prilog"
 
-#: 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 "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Dodaj datoteku poruci"
 
-#: 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 "Ne mogu priložiti datoteku %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 "Ne mogu priložiti datoteku %s: nije standardna datoteka"
 
@@ -11122,73 +11332,83 @@ msgstr "Mime tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje privitka"
 
-#: 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 "Morate da podesite nalog da biste mogli sastaviti poruku."
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Odredište slanja"
 
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Odaberi mape u koje će se poslati poruka."
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Kliknite ovdje za adresar."
 
+#.
 #. * Reply-To:
-#.  *
-#.  * Create this before we call create_from_optionmenu,
-#.  * because that causes from_changed to be called, which
-#.  * expects the reply_to fields to be initialized.
-#: composer/e-msg-composer-hdrs.c:573
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Odgovor na:"
 
+#.
 #. * From
-#: composer/e-msg-composer-hdrs.c:579
+#.
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Od:"
 
+#.
 #. * Subject
-#: composer/e-msg-composer-hdrs.c:585
+#.
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Unesite primatelje poruke"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese na koje će se slati kopija poruke"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: 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."
-msgstr "Unesite adrese na koje će se poslati kopija poruke, a koje se neće pojaviti u popisu primatelja."
+msgstr ""
+"Unesite adrese na koje će se poslati kopija poruke, a koje se neće pojaviti "
+"u popisu primatelja."
 
+#.
 #. * Post-To
-#: composer/e-msg-composer-hdrs.c:610
+#.
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Oglasi na:"
 
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovdje za odabir mapa u koje će se slati poruke"
 
@@ -11196,19 +11416,23 @@ msgstr "Kliknite ovdje za odabir mapa u koje će se slati poruke"
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
-#: composer/e-msg-composer.c:652
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj korisnički račun"
+#: composer/e-msg-composer.c:662
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
+msgstr ""
+"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
+"korisnički račun"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
-"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje za ovaj "
-"korisnički račun"
+"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
+"za ovaj korisnički račun"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
@@ -11216,27 +11440,31 @@ msgstr ""
 "Greška kod čitanja datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Datoteka postoji, prepisai preko nje?"
 
-#: 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 "Greška kod spremanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
+#, c-format
 msgid "Error loading file: %s"
 msgstr "Greška kod učitavanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
+#, c-format
 msgid "Error accessing file: %s"
 msgstr "Greška kod pristupa datoteci: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Ne mogu da povratim poruku iz urednika"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
+#, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
@@ -11244,7 +11472,8 @@ msgstr ""
 "Ne mogu da tražim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
+#, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
@@ -11252,7 +11481,8 @@ msgstr ""
 "Ne mogu da skratim datoteku: %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"
 "%s"
@@ -11260,7 +11490,8 @@ msgstr ""
 "Ne mogu kopirati opis datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
+#, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
@@ -11268,7 +11499,7 @@ msgstr ""
 "Greška kod automatskog spremanja poruke: %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?"
@@ -11276,7 +11507,8 @@ msgstr ""
 "Ximian Evolution je našao nespremljene datoteke iz prethodnih sesija.\n"
 "Želite li ih pokušati povratiti?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
+#, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
 "\n"
@@ -11286,28 +11518,27 @@ msgstr ""
 "\n"
 "Želite li da sačuvam promjene?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1317
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "Automatski stvoren"
 
-#. plural form
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Potpis:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -11315,20 +11546,20 @@ msgstr[0] "Dodana <b>%d</b> datoteka"
 msgstr[1] "Dodane <b>%d</b> datoteke"
 msgstr[2] "Dodano <b>%d</b> datoteka"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
 
-#: 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 "Prikaži Traku s privicima (ovdje ubaciti privitke)"
 
-#: 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 "Sastavi poruku"
 
-#: 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."
@@ -11336,7 +11567,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu pokrenuti kontrolu biranja adresa."
 
-#: 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"
@@ -11348,7 +11579,7 @@ msgstr ""
 "Molim vas da provjerite imate li odgovarajuće inačice\n"
 "gtkhtml i libgtkhtml na sistemu.\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."
@@ -11356,7 +11587,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu aktivirati komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4239
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11445,7 +11676,11 @@ msgid ""
 "receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
-msgstr "<small>Na ovoj stranici možete odabrati želite li dobiti obavijest kada osoba kojoj šaljete poštu pročita poruku, te\nodrediti što da Evolution napravi kad netko od vas zatraži potvrdu da ste pročitali poruku.</small>"
+msgstr ""
+"<small>Na ovoj stranici možete odabrati želite li dobiti obavijest kada "
+"osoba kojoj šaljete poštu pročita poruku, te\n"
+"odrediti što da Evolution napravi kad netko od vas zatraži potvrdu da ste "
+"pročitali poruku.</small>"
 
 #: designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
@@ -11475,7 +11710,8 @@ msgstr "Osim ako je poruka poslata na dopisnu listu, a ne osobno meni"
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr "Kada primite poruku sa zahtjevom za odgovorom, što treba Evolution učiniti? "
+msgstr ""
+"Kada primite poruku sa zahtjevom za odgovorom, što treba Evolution učiniti? "
 
 #: e-util/e-dialog-utils.c:249
 msgid ""
@@ -11506,29 +11742,25 @@ msgid "Sync Categories:"
 msgstr "Sinkroniziram kategorije:"
 
 #. 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.
+#. 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 %m/%d/%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.
+#. 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 %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
-#.  in 12-hour format, without minutes or seconds.
+#. in 12-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
-#.  in 24-hour format, without minutes or seconds.
+#. in 24-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
@@ -11544,55 +11776,47 @@ msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#.  without seconds.
+#. without seconds.
 #: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#.  without seconds.
+#. without seconds.
 #: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#.  without minutes or seconds.
+#. without minutes or seconds.
 #: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#.  without minutes or seconds.
+#. without minutes or seconds.
 #: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%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.
+#. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#.  strftime format of a time in 24-hour format,
-#.  without seconds.
-#.  This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -11603,63 +11827,56 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#. plural form
 #: filter/filter-datespec.c:73
-#, , c-format
+#, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "prije jedne sekunde"
 msgstr[1] "prije %d sekunde"
 msgstr[2] "prije %d sekundi"
 
-#. plural form
 #: filter/filter-datespec.c:74
-#, , c-format
+#, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "prije jedne minute"
 msgstr[1] "prije %d minute"
 msgstr[2] "prije %d minuta"
 
-#. plural form
 #: filter/filter-datespec.c:75
-#, , c-format
+#, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "prije jednog sata"
 msgstr[1] "prije %d sata"
 msgstr[2] "prije %d sati"
 
-#. plural form
 #: filter/filter-datespec.c:76
-#, , c-format
+#, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "prije jednog dana"
 msgstr[1] "prije %d dana"
 msgstr[2] "prije %d dana"
 
-#. plural form
 #: filter/filter-datespec.c:77
-#, , c-format
+#, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "prije jednog tjedna"
 msgstr[1] "prije %d tjedna"
 msgstr[2] "prije %d tjedana"
 
-#. plural form
 #: filter/filter-datespec.c:78
-#, , c-format
+#, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "prije jednog mjeseca"
 msgstr[1] "prije %d mjeseca"
 msgstr[2] "prije %d mjeseci"
 
-#. plural form
 #: filter/filter-datespec.c:79
-#, , c-format
+#, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "prije jedne godine"
@@ -11687,11 +11904,17 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Odaberite ime za usporedbu"
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Pravila _filtera</b>"
+
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Morate dati ime datoteci."
 
 #: filter/filter-file.c:185
+#, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna."
 
@@ -11714,6 +11937,7 @@ msgid "Select Folder"
 msgstr "Označi mapu"
 
 #: filter/filter-input.c:193
+#, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
@@ -11722,18 +11946,18 @@ 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:90
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
+#: 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 "Za napraviti"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Kasnije"
@@ -11783,42 +12007,22 @@ msgid "    "
 msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "<b>Filter Rules</b>"
-msgstr "<b>Pravila filtera</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>Virtual _Folders</b>"
-msgstr "<b>Virtualne _mape</b>"
-
-#: filter/filter.glade.h:4
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Pravila _filtera</b>"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>vFolder izvori</b>"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "Usporedi sa"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "Kategorije"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "Uređivanje VMapa"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "Odlazeći"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -11826,7 +12030,7 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "vremenom u ponoć danog datuma."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -11834,7 +12038,7 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "vremenom kada se filtriranje dogodilo."
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -11842,51 +12046,51 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "trenutnim vremenom kada se filtriranje dogodilo."
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "vrijeme u odnosu na trenutno vrijeme"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "prije"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "mjeseci"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekunde"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "samo određene mape"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "trenutno vrijeme"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "vrijeme koje ste odredili"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "tjedni"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "sa svim aktivnim mrežnim mapama"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "sa svim lokalnim i aktivnim mrežnim mapama"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "sa svim lokalnim mapama"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "godine"
 
@@ -11989,11 +12193,11 @@ msgstr "je"
 
 #: filter/libfilter-i18n.h:28
 msgid "is after"
-msgstr "Prenosim podatke sa %1$S
-"
+msgstr "Prenosim podatke sa %1$S\r"
 
 #: filter/libfilter-i18n.h:29
 msgid "is before"
-msgstr "Šaljem zahtjev na %1$S
-"
+msgstr "Šaljem zahtjev na %1$S\r"
 
 #: filter/libfilter-i18n.h:30
 msgid "is Flagged"
@@ -12107,7 +12311,7 @@ msgstr "Veličina (kB)"
 
 #: filter/libfilter-i18n.h:58
 msgid "sounds like"
-msgstr "zvuči kao
-"
+msgstr "zvuči kao\r"
 
 #: filter/libfilter-i18n.h:59
 msgid "Source Account"
@@ -12125,7 +12329,7 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: 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
@@ -12137,7 +12341,8 @@ msgid "Unset Status"
 msgstr "Nedodeljen status"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
+#, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ime pravila '%s' nije jedinstveno, odaberite drugo."
 
@@ -12153,8 +12358,9 @@ msgstr "Promjeni pravilo"
 msgid "Rule name"
 msgstr "Ime pravila"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Pravila rezultata"
 
 #: filter/searchtypes.xml.h:1
@@ -12189,6 +12395,11 @@ msgstr "Subjekt sadrži"
 msgid "Subject does not contain"
 msgstr "Subjekt ne sadrži"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Virtualne _mape</b>"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Morate imenovati ovaj vfolder."
@@ -12206,7 +12417,8 @@ msgid "Composer Preferences"
 msgstr "Postavke uređivača poruka"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "Podesite postavke pošte, uključujući sigurnost i prikaz poruka"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -12245,8 +12457,8 @@ msgstr "Preglednik za direktorije Evolucija pošte"
 msgid "Evolution Mail preferences control"
 msgstr "Kontrola osobina Evolucija pošte"
 
-#: 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 "Pošta"
@@ -12259,53 +12471,51 @@ msgstr "Poštanski račun"
 msgid "Mail Preferences"
 msgstr "Osobine pošte"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurni ste da želite obrisati ovaj račun?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Ne briši"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:445
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Predefinirano]"
 
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Ime računa"
 
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
-#: 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 "Neimenovano"
 
-#: mail/em-composer-prefs.c:336
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Morate dati ispravno ime skripte."
 
-#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
-msgid "[script]"
-msgstr "[script]"
-
-#: mail/em-composer-prefs.c:878
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:926
-msgid "Add script signature"
-msgstr "Dodaj potpis skripte"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "Dod_aj potpis"
 
-#: mail/em-composer-prefs.c:946
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
 #: mail/em-composer-utils.c:124
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -12328,8 +12538,8 @@ msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Budući da je kontakt lista koju šaljete konfigurirana tako da sakrije adrese, ova poruka "
-"će sadržavati samo skrivene primatelje (Bcc)."
+"Budući da je kontakt lista koju šaljete konfigurirana tako da sakrije "
+"adrese, ova poruka će sadržavati samo skrivene primatelje (Bcc)."
 
 #: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
@@ -12341,8 +12551,8 @@ msgid ""
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Moguće je da poslužitelj za poštu otkrije primatelje dodavanjem Apparently-To u  "
-"zaglavlje.\n"
+"Moguće je da poslužitelj za poštu otkrije primatelje dodavanjem Apparently-"
+"To u  zaglavlje.\n"
 "Treba li svejedno poslati?"
 
 #: mail/em-composer-utils.c:305
@@ -12357,7 +12567,7 @@ msgstr ""
 "Ne mogu otvoriti mapu sa pripremom za ovaj račun.\n"
 "Želite li da koristite predefinisanu mapu sa pripremom?"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtualnu mapu iz pretrage..."
 
@@ -12391,7 +12601,7 @@ msgstr "<kliknite ovdje za odabir mape>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorij"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: 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:"
@@ -12403,7 +12613,7 @@ msgid "Folder _name:"
 msgstr "_Ime mape:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "VFolder-i"
 
@@ -12420,113 +12630,118 @@ msgstr "Dolazna pošta"
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: mail/em-folder-tree.c:874
-#, , c-format
+#: mail/em-folder-tree.c:877
+#, c-format
 msgid "Moving folder %s"
 msgstr "Premještam mapu %s"
 
-#: mail/em-folder-tree.c:876
-#, , c-format
+#: mail/em-folder-tree.c:879
+#, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram mapu %s"
 
-#: mail/em-folder-tree.c:883
-#, , c-format
+#: mail/em-folder-tree.c:886
+#, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premještam poruke u mapu %s"
 
-#: mail/em-folder-tree.c:885
-#, , c-format
+#: mail/em-folder-tree.c:888
+#, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u mapu %s"
 
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu ispustiti poruke u spremište najviše razine"
 
-#: mail/em-folder-tree.c:1947
-#, , c-format
+#: mail/em-folder-tree.c:1950
+#, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Ne mogu premjestiti mapu `%s': nedozvoljena operacija"
 
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: 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 "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:2032
-#, , c-format
+#: mail/em-folder-tree.c:2035
+#, c-format
 msgid "Creating folder `%s'"
 msgstr "Stvaram mapu \"%s\""
 
-#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2347
+#, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ne mogu obrisati mapu: %s"
 
-#: mail/em-folder-tree.c:2361
-#, , c-format
+#: mail/em-folder-tree.c:2372
+#, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Ne mogu obrisati mapu %s."
 
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2378
+#, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Treba li doista obrisati mapu \"%s\" i sve njene podmape?"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2388
+#, c-format
 msgid "Delete \"%s\""
 msgstr "Obriši \"%s\""
 
-#: mail/em-folder-tree.c:2411
-#, , c-format
+#: mail/em-folder-tree.c:2422
+#, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Ne mogu preimenovati mapu %s."
 
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2431
+#, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapu \"%s\" u:"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2457
+#, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Mapa pod imenom \"%s\" već postoji. Molim koristite neko drugo ime."
 
-#: mail/em-folder-tree.c:2492 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 "P_ogled"
 
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Pomakni"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Postavke..."
 
@@ -12676,210 +12891,232 @@ msgstr "Ispiši poruku"
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za slanje pošte %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 "Poklapanja: %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 "Nepotpisano"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke istinit."
+msgstr ""
+"Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke istinit."
 
-#: 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 "Ispravni potpis"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr "Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj za kojeg se predstavlja."
+msgstr ""
+"Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj za "
+"kojeg se predstavlja."
 
-#: 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 "Neispravni potpis"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr "Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
+msgstr ""
+"Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
 
-#: 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 "Ispravni potpis, ne mogu provjeriti pošiljatelja"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr "Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može provjeriti"
+msgstr ""
+"Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može "
+"provjeriti"
 
-#: 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 "Nekriptirano"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
-msgstr "Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje internetom."
+msgstr ""
+"Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje "
+"internetom."
 
-#: 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 "Kriptirano, slaba enkripcija"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
-msgstr "Ova poruka je kriptirana, ali sa slabim enkripcijskim algoritmom. Bilo bi teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
+msgstr ""
+"Ova poruka je kriptirana, ali sa slabim enkripcijskim algoritmom. Bilo bi "
+"teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno "
+"kratkom vremenu."
 
-#: 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 "Šifrirano"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
+msgstr ""
+"Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
 
-#: 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 "Kriptirano, jaka enkripcija"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
-msgstr "Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
+msgstr ""
+"Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško "
+"stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno na %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M %p"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Pogledaj unutar"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Sakrij"
 
 #: mail/em-format-html-print.c:125
+#, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %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 "Dohvaćanje `%s'"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Neispravan vanjski dio poruke."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
+#, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP adresu (%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 "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
+#, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
+#, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežne podatke (%s) "
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
+#, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Formatiranje poruke"
 
-#: mail/em-format-html.c:1406 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:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1406 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:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Odgovor-Za"
 
-#: mail/em-format-html.c:1406 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:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Prima"
 
-#: mail/em-format-html.c:1406 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc (kopija)"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
+#: 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 (nevidljiva kopija)"
 
 #. pseudo-header
-#: mail/em-format-html.c:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Program e-pošte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: 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:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
+#: 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 "Datum"
 
-#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "Interesne grupe"
 
@@ -12894,7 +13131,7 @@ msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
 
 #: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
 #: mail/em-format.c:1223
-#, , c-format
+#, c-format
 msgid "Internal error: expecting CamelMultipart, got \"%s\""
 msgstr "Interna greška:  očekivao sam CamelMultipart, a dobio sam  \"%s\""
 
@@ -12919,7 +13156,7 @@ msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri provjeri potpisa"
 
 #: mail/em-format.c:1372
-#, , c-format
+#, c-format
 msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
 msgstr "Interna greška: očekivao sam CamelMimeMessage, a dobio sam  \"%s\""
 
@@ -12950,25 +13187,28 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice Evolutiona 1.x.\n"
+"Lokacija hijerarhije Evolution mape kontakata se promijenila od inačice "
+"Evolutiona 1.x.\n"
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: 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 "Nije uspjela migracija pop3 uid međuspremnika: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
-#, , c-format
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
+#, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Neuspjelo migriranje proširenog stanja mape: %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 "Nije uspjelo stvaranje direktorija `%s': %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
+#, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nisam uspio otvoriti spremište za `%s': %s"
 
@@ -12977,6 +13217,7 @@ msgid "Save As..."
 msgstr "Snimi kao..."
 
 #: mail/em-popup.c:716
+#, c-format
 msgid "untitled_image.%s"
 msgstr "nenaslovljena_slika.%s"
 
@@ -13001,35 +13242,37 @@ msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
 #: mail/em-popup.c:963
+#, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %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 "Ova lokacija ne podržava pretplate ili nije omgućena"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "U pretplati"
 
-#: 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 "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:831
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "Molim odaberite server."
 
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Nije odabran poslužitelj"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovno ovu poruku."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
+#, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
@@ -13037,25 +13280,26 @@ msgstr ""
 "Greška kod učitavanja podataka filtera:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Proslijeđena poruka --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "nepoznati pošiljatelj"
 
 #. translators: attribution string used when quoting messages,
-#.  it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
 
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
@@ -13063,7 +13307,8 @@ msgstr ""
 "Ne mogu spremiti u `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
+#, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
@@ -13071,52 +13316,56 @@ msgstr ""
 "`%s' već postoji.\n"
 "Prepisati?"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "cedulja"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
+#, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Greška: '%s' postoji i nije obična datoteka"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Spremi poruku..."
 
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
-#, , c-format
+#: mail/em-utils.c:2073
+#, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
+#, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisam mogao napraviti privremeni direktorij: %s"
 
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
+#, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
 "s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Ova operacija će trajno ukloniti sve obrisane poruke u mapi `%"
-"s'. Ako nastavite, nećete moći vratiti navedene poruke.\n"
+"Ova operacija će trajno ukloniti sve obrisane poruke u mapi `%s'. Ako "
+"nastavite, nećete moći vratiti navedene poruke.\n"
 "\n"
 "Dali stvarno želite obrisati ove poruke?"
 
-#: mail/em-utils.c:2477
+#: 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"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Ova operacija će trajno ukloniti sve obrisane poruke u svim mapama. Ako nastavite, nećete moći vratiti navedene poruke.\n"
+"Ova operacija će trajno ukloniti sve obrisane poruke u svim mapama. Ako "
+"nastavite, nećete moći vratiti navedene poruke.\n"
 "\n"
 "Dali stvarno želite obrisati ove poruke?"
 
@@ -13177,400 +13426,424 @@ msgid "Default height of the Message Window"
 msgstr "Uobičajena visina prozora za poruke"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Uobičajena visina prozora za poruke"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Uobičajeni način odgovaranja"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Uobičajena širina prozora Composera"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Uobičajena širina prozora za poruke"
 
-#: 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 "Uobičajena širina prozora za poruke"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtavanje grešaka u pravopisu prilikom utipkavanja"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska"
 
-#: 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 "Ispražnjavanje mapa sa smećem prilikom izlaska iz Evolutiona."
 
-#: 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 "Omogući caret način rada, tako da se vidi pokazivač prilikom čitanja pošte."
+msgstr ""
+"Omogući caret način rada, tako da se vidi pokazivač prilikom čitanja pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Omogući/onemogući caret način rada"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Visina ploče s popisom poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Visina ploče s popisom poruka."
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
-"Ako postoji ugrađeni preglednik za određeni mime-tip unutar Evolutiona,"
-"svi mime-tipovi koji su prikazani u popisu a odgovaraju bonobo-component "
+"Ako postoji ugrađeni preglednik za određeni mime-tip unutar Evolutiona,svi "
+"mime-tipovi koji su prikazani u popisu a odgovaraju bonobo-component "
 "pregledniku u GNOME mime-tip bazi mogu se koristiti za pregled sadržaja."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid "Last time empty trash was run"
 msgstr "Zadnji put je bio pokrenut prazni koš za smeće"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "Izlistavanje oznaka i njima pridruženih boja"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Popis korisničkih računa"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
-"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. "
-"Popis sadrži znakovne nizove s imenima poddirektorija relativnih s"
-" /apps/evolution/mail/accounts."
+"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. Popis "
+"sadrži znakovne nizove s imenima poddirektorija relativnih s /apps/evolution/"
+"mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "Popis prilagođenih zaglavlja i da li su oni omogućeni."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
-"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. "
-"Popis sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML "
-"heks kodiranje."
+"Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. Popis "
+"sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML heks "
+"kodiranje."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Popis mime tipova koji traže bonobo preglednike komponenata"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr "Učitavanje slika za HTML poruke preko http-a"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
-"Učitavanje slika za HTML poruke preko http-a. Moguće vrijednosti su: 0 - Nikad ne "
-"učitavaj slike s mreže 1 - Učitavaj slike ako je pošiljatelj u adresaru 2 - Uvijek "
-"učitavaj slike s mreže"
+"Učitavanje slika za HTML poruke preko http-a. Moguće vrijednosti su: 0 - "
+"Nikad ne učitavaj slike s mreže 1 - Učitavaj slike ako je pošiljatelj u "
+"adresaru 2 - Uvijek učitavaj slike s mreže"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "Logiranje akcija filtra u navedenu log datoteku."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Logiranje akcija filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao pregledano nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao pregledano nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označivanje citata u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označivanje citata u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "Visina prozora poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "Širina prozora poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (normalno, puna zaglavlja, kod)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanji broj dana između pražnjenja koša za smeće"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Najmanji broj dana između pražnjenja koša za smeće kod izlaska iz programa."
+msgstr ""
+"Najmanji broj dana između pražnjenja koša za smeće kod izlaska iz programa."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obavijest o novopristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Nova vrsta obavijesti o pristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Iskoči u slučaju praznog naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upitaj korisnika kada pokuša obrisati mapu."
 
-#: mail/evolution-mail.schemas.in.in.h:52
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: 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 "Upitaj korisnika kada pokuša poslati poruku bez naslova."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Upitaj korisnika prilikom brisanja"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik popuni samo Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"Upitaj kada korisnik pokuša poslati HTML poštu primateljima koji možda ne žele "
-"primati HTML poštu."
+"Upitaj kada korisnik pokuša poslati HTML poštu primateljima koji možda ne "
+"žele primati HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upitaj kada korisnik pokuša poslati neželjeni HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zamijeni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaj smješke u tekstu i zamijeni ih slikama."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Pokreni testiranje na smeće na dolaznoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Prikaži animirane slike kao animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikaži obrisane poruke (precrtane) u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Zvučna datoteka koju treba odsvirati pri pristizanju nove pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Određuje tip notifikacije o novoj pošti koju korisnik želi koristiti."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Provjera pravopisa na licu mjesta"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Visina prozora poruke"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Širina prozora poruke"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Pismo terminala"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "Zadnji put kada je program koša za smeće bio pokrenut, u danima od pokretanja sustava."
+msgstr ""
+"Zadnji put kada je program koša za smeće bio pokrenut, u danima od "
+"pokretanja sustava."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "Pismo terminala za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "Pismo varijabilne širine za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: 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;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"Ovo treba sadržavati listu XML struktura određujući korisnička zaglavlja "
-"i sve što treba biti prikazano. Format XML strukture je &lt;"
-"header enabled&gt; - uključi ako zaglavlje treba biti prikazano u prikazu "
-"pošte."
+"Ovo treba sadržavati listu XML struktura određujući korisnička zaglavlja i "
+"sve što treba biti prikazano. Format XML strukture je &lt;header enabled&gt; "
+"- uključi ako zaglavlje treba biti prikazano u prikazu pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži listu poruka u obliku niti na temelju naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "UID string predefinirang korisničkog računa"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Koristi Spamassassin daemon i klijent"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Koristi Spamassassin daemon i klijent (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Koristi prilagođena pisma"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi prilagođena pisma za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne testove za spam."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne testove za spam (bez DNS-a)."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Font promjenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "Pogled/Bcc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "Pogled/Bcc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "Pogled/Cc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "Pogled/Cc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "Pogled/Od stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "Pogled/Od stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "Pogled/Za stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "Pogled/Za stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Treba li se prebaciti na nizanje po subjektu kada poruka ne sadrži "
-"In-Reply-To ili References zaglavlja."
+"Treba li se prebaciti na nizanje po subjektu kada poruka ne sadrži In-Reply-"
+"To ili References zaglavlja."
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "veza za pokretanje korisnički pokrenutim spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "spamd port"
 
@@ -13609,14 +13882,14 @@ msgstr "Evolution uvozi vašu staru Elm poštu"
 #: 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 "Obrađujem"
 
 #: 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 "Molim pričekajte"
 
@@ -13647,7 +13920,7 @@ msgstr "Izaberite mapu za uvoz u"
 #: mail/importers/evolution-mbox-importer.c:219
 #: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
-#, , c-format
+#, c-format
 msgid "Importing `%s'"
 msgstr "Uvoz `%s'"
 
@@ -13657,14 +13930,16 @@ msgid "Importing mailbox"
 msgstr "Uvoz sandučića"
 
 #: mail/importers/mail-importer.c:354
+#, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
+#, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni 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"
@@ -13690,7 +13965,7 @@ msgstr ""
 "prioriteta. Provjerite uvežene filtere da se uvjerite\n"
 "radi li sve kao što bi trebalo."
 
-#: 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"
@@ -13702,7 +13977,7 @@ msgstr ""
 "opciju, koju Evolution ne podržava.\n"
 "Ovi filteri neće ostati."
 
-#: 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"
@@ -13716,23 +13991,23 @@ msgstr ""
 "su promjenjeni da bi mogli provjeriti je li taj niz\n"
 "sadržan u tijelu poruke ili nije."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution uvozi vaše stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Uvoz Netscape podataka"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Postavke"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Filteri pošte"
 
-#: 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?"
@@ -13764,12 +14039,12 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
 msgstr "Niste unijeli sve potrebne podatke."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:145
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolution računa"
 
@@ -13785,27 +14060,32 @@ msgstr "_Korisničko ime:"
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-account-gui.c:2086
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete otvoriti dva naloga sa istim imenom."
 
 #: mail/mail-autofilter.c:75
+#, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
 #: mail/mail-autofilter.c:261
+#, c-format
 msgid "Subject is %s"
 msgstr "Subjekt je %s"
 
 #: mail/mail-autofilter.c:277
+#, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
 #: mail/mail-autofilter.c:294
+#, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
 #: mail/mail-autofilter.c:318
+#, c-format
 msgid "Replies to %s"
 msgstr "Odgovara na %s"
 
@@ -13813,11 +14093,12 @@ msgstr "Odgovara na %s"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo za filter"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Sljedeća pravila filtera:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
+#, c-format
 msgid ""
 "Used the removed folder:\n"
 "    '%s'\n"
@@ -13859,23 +14140,26 @@ msgstr "Stvori novu mapu e-pošte"
 msgid "URI of the mail source that the view will display"
 msgstr "URI poruke koju će pogled pokazati"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr "Molim unesite dolje vaše ime i adresu e-pošte. \"Opcionalna\" polja dolje ne moraju biti popunjena, osim ako ne želite ove podatke uključiti u poruke koje šaljete."
+msgstr ""
+"Molim unesite dolje vaše ime i adresu e-pošte. \"Opcionalna\" polja dolje ne "
+"moraju biti popunjena, osim ako ne želite ove podatke uključiti u poruke "
+"koje šaljete."
 
-#: 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 "Primanje pošte"
 
-#: 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."
@@ -13883,25 +14167,27 @@ msgstr ""
 "Molim unesite podatke o vašem dolazećem serveru za poštu. Ako niste sigurni, "
 "pitajte sustav administratora ili davatelja Internet usluga."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr "Molim unesite podatke o načinu na koji želite slati poštu. Ako niste sigurni, pitajte sustav administratora ili davatelja Internet usluga."
+msgstr ""
+"Molim unesite podatke o načinu na koji želite slati poštu. Ako niste "
+"sigurni, pitajte sustav administratora ili davatelja Internet usluga."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Upravljanje računima"
 
-#: 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 "
@@ -13910,17 +14196,18 @@ msgid ""
 "purposes only."
 msgstr ""
 "Skoro ste završili sa procesom podešavanja pošte. Identitet, dolazeći server "
-"za poštu i odlazeći način koji ste unijeli biti će grupirani zajedno za izradu Evolution korisničkog računa."
-"Molim unesite dolje ime za ovaj korisnički račun. Ime će biti korišteno"
-"samo za potrebe prikazivanja na zaslonu."
+"za poštu i odlazeći način koji ste unijeli biti će grupirani zajedno za "
+"izradu Evolution korisničkog računa.Molim unesite dolje ime za ovaj "
+"korisnički račun. Ime će biti korištenosamo za potrebe prikazivanja na "
+"zaslonu."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Provjeravam servis"
 
-#: 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 "Spajam se na server...
-"
+msgstr "Spajam se na server...\r"
 
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
@@ -14282,7 +14569,8 @@ msgstr ""
 
 #: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
+msgstr ""
+"Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
 
 #: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
@@ -14407,7 +14695,9 @@ msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo jezici za koje imate instaliran rječnik."
+msgstr ""
+"Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo "
+"jezici za koje imate instaliran rječnik."
 
 #: mail/mail-config.glade.h:146
 msgid ""
@@ -14528,10 +14818,12 @@ msgid "description"
 msgstr "opis"
 
 #: mail/mail-folder-cache.c:796
+#, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
+#, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
@@ -14539,7 +14831,8 @@ msgstr ""
 "Greška pri '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
+#, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
@@ -14547,7 +14840,7 @@ msgstr ""
 "Greška kod izvršenja operacije:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Radim"
 
@@ -14560,10 +14853,12 @@ msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
 #: mail/mail-ops.c:534
+#, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
 #: mail/mail-ops.c:559
+#, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
@@ -14572,15 +14867,17 @@ msgstr ""
 "Umjesto toga dodajem u lokalnu mapu \"Poslano\"."
 
 #: mail/mail-ops.c:568
+#, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisam mogao smjestiti poštu u lokalnu mapu \"Poslano\": %s"
 
 #: mail/mail-ops.c:664
+#, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 #: mail/mail-ops.c:695
-#, , c-format
+#, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Greška kod slanja %d od %d poruka"
 
@@ -14593,14 +14890,17 @@ msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
 #: mail/mail-ops.c:881
+#, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
 #: mail/mail-ops.c:881
+#, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
 #: mail/mail-ops.c:994
+#, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
@@ -14609,28 +14909,32 @@ msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
 #: mail/mail-ops.c:1233
+#, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
 #: mail/mail-ops.c:1305
+#, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
 #: mail/mail-ops.c:1383
+#, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
 #: mail/mail-ops.c:1477
+#, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
 #: mail/mail-ops.c:1542
-#, c-format
+#, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i spreman korisnički račun \"%s\""
 
 #: mail/mail-ops.c:1543
-#, , c-format
+#, c-format
 msgid "Storing account '%s'"
 msgstr "Spremam korisnički račun '%s'"
 
@@ -14643,6 +14947,7 @@ msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
 #: mail/mail-ops.c:1682
+#, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
@@ -14651,24 +14956,26 @@ msgid "Local Folders"
 msgstr "Direktoriji"
 
 #: mail/mail-ops.c:1766
+#, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#. plural form
 #: mail/mail-ops.c:1838
+#, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#. plural form
 #: mail/mail-ops.c:1924
+#, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
 #: mail/mail-ops.c:1974
+#, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
@@ -14677,6 +14984,7 @@ msgstr ""
 " %s"
 
 #: mail/mail-ops.c:2002
+#, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
@@ -14689,6 +14997,7 @@ msgid "Saving attachment"
 msgstr "Spremam prilog"
 
 #: mail/mail-ops.c:2090
+#, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
@@ -14697,14 +15006,17 @@ msgstr ""
 " %s"
 
 #: mail/mail-ops.c:2120
+#, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
 #: mail/mail-ops.c:2268
+#, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
 #: mail/mail-ops.c:2268
+#, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
@@ -14732,63 +15044,68 @@ msgstr ""
 msgid "Security Information"
 msgstr "Podaci o sigurnosti"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
-msgstr "Poništavam...
-"
+msgstr "Poništavam...\r"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
+#, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Poslužitelj: %s, tip: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
+#, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
+#, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Pošalji i primi poštu"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "Poništi sve"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Ažuriram..."
 
-#: 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 "Pričekajte..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
+#, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ovog postupka"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
+#, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nisam mogao sačuvati datoteku sa potpisom: %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"
@@ -14798,37 +15115,39 @@ msgstr ""
 "\n"
 "Želite li ga spremiti?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Odbaci promjene"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Spremi potpis"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Promjeni potpis"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Unesite ime za ovaj potpis."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Ime:"
 
 #: mail/mail-tools.c:114
-#, , c-format
+#, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Ne mogu napraviti spool direktorij `%s': %s"
 
 #: mail/mail-tools.c:141
-#, c-format
+#, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Pokušaj premjestiti e-poštu u izvor \"%s\", koji nije poštanski sandučić."
+msgstr ""
+"Pokušaj premjestiti e-poštu u izvor \"%s\", koji nije poštanski sandučić."
 
 #: mail/mail-tools.c:276
+#, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosljeđena poruka - %s"
 
@@ -14837,18 +15156,22 @@ msgid "Forwarded message"
 msgstr "Prosljeđena poruka"
 
 #: mail/mail-tools.c:319
+#, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Neispravna mapa: `%s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
+#, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
+#, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
+#, c-format
 msgid ""
 "The following vFolder(s):\n"
 "%sUsed the removed folder:\n"
@@ -14860,83 +15183,84 @@ msgstr ""
 "    '%s'\n"
 "Potom su osvježeni."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
+#, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokušavam promijeniti vmapu '%s' koja ne postoji."
 
-#: 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 "Neviđeno"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Viši"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Najviši"
 
-#: 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 "Danas %k:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Jučer %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 "Radim popis poruka"
 
@@ -15090,15 +15414,17 @@ msgstr "Inačica podešavanja Evolutiona"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "Identifikacijski broj ili  alias komponente koja se uobičajeno prikazuje prilikom pokretanja."
+msgstr ""
+"Identifikacijski broj ili  alias komponente koja se uobičajeno prikazuje "
+"prilikom pokretanja."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
-"Ako je postavljeno, Evolution će se pokrenuti u neumreženom načinu rada umjesto "
-"uobičajenom umreženom načinu."
+"Ako je postavljeno, Evolution će se pokrenuti u neumreženom načinu rada "
+"umjesto uobičajenom umreženom načinu."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid ""
@@ -15109,8 +15435,10 @@ msgstr ""
 "inačicama Evolutiona."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Path to the default calendar folder"
@@ -15189,6 +15517,7 @@ msgid "Autocompletion Folders"
 msgstr "Mape za samodopunjavanje"
 
 #: shell/e-shell-folder-creation-dialog.c:137
+#, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
@@ -15197,6 +15526,7 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Navedeno ime direktorija nije ispravno: %s"
 
@@ -15216,16 +15546,17 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Odaberite datoteku koju želite importirati u Evolution, te odaberite iz popisa koje je "
-"vrste.\n"
+"Odaberite datoteku koju želite importirati u Evolution, te odaberite iz "
+"popisa koje je vrste.\n"
 "\n"
-"Ako ne znate, odaberite \"Automatski\", pa će Evolution pokušati sam pogoditi."
+"Ako ne znate, odaberite \"Automatski\", pa će Evolution pokušati sam "
+"pogoditi."
 
 #: shell/e-shell-importer.c:154
 msgid "Choose the destination for this import"
 msgstr "Odaberite odredište za ovaj uvoz"
 
-#: 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 "Molim odaberite podatke koje želite uvesti:"
 
@@ -15242,6 +15573,7 @@ msgstr ""
 "pokušati ponovo, molim pritisnite gumb \"Natrag\".\n"
 
 #: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
+#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
@@ -15253,24 +15585,27 @@ msgstr ""
 msgid "Select importer"
 msgstr "Odaberite uvoznika"
 
-#: 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 "Datoteka %s ne postoji"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Uvoz"
 
-#: shell/e-shell-importer.c:463
-#, , c-format
+#: shell/e-shell-importer.c:465
+#, c-format
 msgid "Importing %s.\n"
 msgstr "Uvoz %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 "Greška prilikom učitavanja %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
+#, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
@@ -15278,31 +15613,31 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim 1. stavku."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatski"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Ime datoteke:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "_Uvezi podatke i postavke iz starijih programa"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "_Uvezi jednu datoteku"
 
-#: 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"
@@ -15310,24 +15645,25 @@ msgstr ""
 "Molim pričekajte...\n"
 "Tražim postojeća podešavanja"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
-#: 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 "Od %s:"
 
-#: shell/e-shell-importer.c:1034
-#, , c-format
+#: shell/e-shell-importer.c:1037
+#, c-format
 msgid "No importer available for file %s"
 msgstr "Nema dostupnog uvoznika za datoteku %s"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "Nisam mogao izvršiti uvoznika"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Uvoz"
 
@@ -15340,8 +15676,8 @@ msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
 
 #. It would be nice to insensitivize the OK button appropriately
-#.  instead of doing this, but unfortunately we can't do this for the
-#.  Bonobo control.
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
 #: shell/e-shell-shared-folder-picker-dialog.c:281
 msgid "Please select a user."
 msgstr "Molim odaberite korisnika."
@@ -15351,14 +15687,17 @@ msgid "Opening Folder"
 msgstr "Otvaram direktorij"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:393
+#, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otvaram direktorij \"%s\""
 
 #: shell/e-shell-shared-folder-picker-dialog.c:398
+#, c-format
 msgid "in \"%s\" ..."
 msgstr "u \"%s\"..."
 
 #: shell/e-shell-shared-folder-picker-dialog.c:482
+#, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Ne mogu otvoriti djeljeni direktorij: %s"
 
@@ -15366,11 +15705,11 @@ msgstr "Ne mogu otvoriti djeljeni direktorij: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Ne mogu naći navedenu dijeljenu mapu."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Počinjem uvoz"
 
-#: 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 "
@@ -15409,6 +15748,7 @@ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Čini se da GNOME Pilot alati nisu instalirani na ovaj sistem."
 
 #: shell/e-shell-window-commands.c:71
+#, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
@@ -15437,8 +15777,10 @@ msgid "Work Offline"
 msgstr "Neumreženi rad"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr """Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
 "mreže."
 
 #: shell/e-shell-window.c:334
@@ -15446,8 +15788,11 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution je u procesu odlaska u rad bez mreže."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na mreži."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na "
+"mreži."
 
 #: shell/e-shell.c:537
 #, c-format
@@ -15456,7 +15801,8 @@ msgid ""
 "The data hasn't been deleted, but it will not be seen by this version of "
 "Evolution.\n"
 msgstr ""
-"Upozorenje: Evolution ne može nadograditi sve vaše podatke iz inačice  %d.%d.%d.\n"
+"Upozorenje: Evolution ne može nadograditi sve vaše podatke iz inačice  %d.%d."
+"%d.\n"
 "Podaci nisu obrisani, ali ih nećete moći vidjeti u ovoj inačici Evolutiona.\n"
 
 #: shell/e-shell.c:1063
@@ -15481,11 +15827,11 @@ msgstr "Kvadratić"
 
 #: 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 "Novi"
 
 #: shell/evolution-shell-component-utils.c:124
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15496,6 +15842,7 @@ msgstr ""
 "Nepoznata greška."
 
 #: shell/evolution-shell-component-utils.c:127
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15508,6 +15855,7 @@ msgstr ""
 "%s"
 
 #: shell/evolution-shell-component-utils.c:134
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -15532,16 +15880,17 @@ msgid "Create a new test item"
 msgstr "Unesi novi zadatak"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Aktivne veze"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Odaberite OK za prekid ovih veza"
+msgid "Active Connections"
+msgstr "Aktivne veze"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Sljedeće veze su trenutno aktivne:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Odaberite OK za prekid ovih veza"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -15659,27 +16008,29 @@ msgstr ""
 "Ovaj pomoćnik će vas provesti kroz postupak \n"
 "uvoza vanjskih datoteka u Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Uvoznici"
 
-#: 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 "Uvoz"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ne pitaj me više"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može uvesti podatke iz sijedećih datoteka:"
 
-#: shell/main.c:217
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
@@ -15713,7 +16064,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaše doprinose!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15721,47 +16072,49 @@ msgstr ""
 "Hvala\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovno reći"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
+#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne mogu pokreniti Ximian Evolution ljusku : %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evolution aktiviranjem određene komponente"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve dijelove evolutiona"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Inzistiraj na ponovnoj migraciji iz Evoultion 1.4"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih komponenti u datoteku."
 
-#: 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"
 "  Use %s --help for more information.\n"
@@ -15797,11 +16150,12 @@ msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
 #: smime/gui/certificate-viewer.c:334
+#, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Preglednik certifikata: %s"
 
 #: smime/gui/component.c:45
-#, , c-format
+#, c-format
 msgid "Enter the password for `%s'"
 msgstr "Unesite lozinku za `%s'"
 
@@ -15816,6 +16170,7 @@ msgstr "Upišite novu lozinku"
 
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
+#, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
@@ -15824,6 +16179,7 @@ msgstr ""
 "  Naslov: %s\n"
 
 #: smime/gui/e-cert-selector.c:122
+#, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
@@ -15908,6 +16264,7 @@ msgid "Contact Certificates"
 msgstr "Certifikati kontakata"
 
 #: smime/gui/smime-ui.glade.h:21
+#, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr "Želite li vjerovati \"%s\" u sljedećim prigodama?"
 
@@ -15988,8 +16345,10 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organizations that identify you:"
 
 #: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
-msgstr "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+"You have certificates on file that identify these certificate authorities:"
 
 #: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -16089,6 +16448,7 @@ msgid "UID"
 msgstr "UID"
 
 #: smime/lib/e-cert.c:635
+#, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator objekta (%S)"
 
@@ -16169,6 +16529,7 @@ msgid "Extensions"
 msgstr "Nastavci"
 
 #: smime/lib/e-cert.c:983
+#, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
@@ -16229,12 +16590,15 @@ msgid "Default subject for the message."
 msgstr "Predefinirani naslov poruke."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
-#.  * found, so just bail completely.
+#. * found, so just bail completely.
+#.
 #: tools/killev.c:63
+#, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nisam mogao izvršiti \"%s\": %s\n"
 
 #: tools/killev.c:78
+#, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
 
@@ -16266,7 +16630,7 @@ msgstr "Premjesti kontakt(e) u drugu mapu..."
 msgid "Move to Folder..."
 msgstr "Premjesti u mapu..."
 
-#: 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 "Nalijepi na poseban način"
 
@@ -16276,7 +16640,7 @@ msgstr "Pregled kontakata za ispis"
 
 #: 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 "_Pregled prije ispisa"
 
@@ -16324,13 +16688,13 @@ msgstr "Zaustavi učitavanje"
 msgid "View the current contact"
 msgstr "Pregledaj tekući kontakt"
 
-#: 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 "_Akcije"
 
@@ -16351,14 +16715,10 @@ msgid "_Save as VCard"
 msgstr "_Sačuvaj kao VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Potraži kontakte"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Odaberi sve"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
@@ -16366,58 +16726,54 @@ msgstr "_Pošalji poruku kontaktu..."
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Obriši sve pojave"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Obriši sastanak"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Idi na"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Idi nazad"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Naprijed"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Idi na _datum"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Idi na određeni datum"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Idi na današnji dan"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Popis"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mjesec"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Dalje"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Pregled kalendara za ispis"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Prethodni"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Ispis ovog kalendara "
@@ -16426,7 +16782,7 @@ msgstr "Ispis ovog kalendara "
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi slobodan/zauzet informaciju za ovaj kalendar"
 
-#: 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 "Obriši"
 
@@ -16435,34 +16791,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Izbriši stare dogovore i sastanke"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Odaberi sav tekst"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Idi na određeni datum"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Izaberite direktorij"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Prikaži kao listu"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Prikaži jedan mjesec"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Prikaži jedan tjedan"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Prikaži radni tjedan"
 
-#: 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 "Danas"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Pogledaj trenutni sastanak"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Tjedan"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
@@ -16715,7 +17091,8 @@ msgid "Hide _Read Messages"
 msgstr "Sakrij pro_čitane poruke"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Sakrij obrisane poruke umjesto njihovog precrtavanja"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -16998,10 +17375,6 @@ msgstr "Pomakni"
 msgid "Move selected message(s) to another folder"
 msgstr "Premjesti odabranu poruku(e) u drugi direktorij"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Dalje"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Sljedeća _važna poruka"
@@ -17050,10 +17423,6 @@ msgstr "Pr_ethodna važna poruka"
 msgid "Preview the message to be printed"
 msgstr "Pregled poruke za ispis"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Prethodni"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Ispiši ovu poruku"
@@ -17464,39 +17833,39 @@ msgstr "Kopiraj odabrani zadatak"
 msgid "Cut selected task"
 msgstr "Izreži odabrani zadatak"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Obriši izvršene zadatke"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Obriši odabrane zadatke"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Označi kao završeno"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Označi odabrane zadatke kao završene"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Umetni zadatak iz međumemorije"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Pregled liste zadataka za ispis"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Ispis popisa zadataka "
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Pogledaj odabrani zadatak"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
@@ -17625,10 +17994,15 @@ msgid "_Day View"
 msgstr "_Dnevni pregled"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Korisnički pogled"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Mjesečni pregled "
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Pregled _radnog tjedna"
 
@@ -17657,10 +18031,16 @@ msgid "_Messages"
 msgstr "_Poruke"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Uz _kategoriju"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Datum krajnjeg roka:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Postavi status"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zadaci"
 
@@ -17708,7 +18088,7 @@ msgid "Define Views..."
 msgstr "Odredi poglede..."
 
 #. Translators: These are the first characters of each day of the
-#.  week, 'M' for 'Monday', 'T' for Tuesday etc.
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PUSČPSN"
@@ -17722,11 +18102,8 @@ msgstr "%B %Y"
 msgid "Now"
 msgstr "Sad"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Danas"
-
 #: widgets/misc/e-cell-date-edit.c:805
+#, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vrijeme mora biti u formatu: %s"
 
@@ -17734,81 +18111,87 @@ msgstr "Vrijeme mora biti u formatu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Postotna vrijednost mora biti između 0 i 100, uključno"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltik"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Srednjeeuropski"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Kineski"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Ćirilica"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Grčki"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japanski"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Korejski"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turski"
 
-#: 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 "Zapadno europski"
 
-#: 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 "Zapadno europski"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradicionalno"
 
-#: 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 "Pojednostavljen"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Vidljivo"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %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 "Kodiranje znakova"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Odaberite kodnu stranicu"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Ostalo..."
 
@@ -17872,6 +18255,11 @@ msgstr "Greška u sintaksi"
 msgid "Spacing around expander arrow"
 msgstr "Razmaci oko strelica za grananje"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_&Traži"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Urednik pretrage"
@@ -17935,3 +18323,50 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Izvori adresara"
+
+#~ msgid "Selected:"
+#~ msgstr "Označeno"
+
+#~ msgid "Go To Date"
+#~ msgstr "Idi na datum"
+
+#~ msgid "_Go To Today"
+#~ msgstr "_Idi na danas"
+
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "<b>Pravila filtera</b>"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Kategorije"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Uređivanje VMapa"
+
+#~ msgid "Outgoing"
+#~ msgstr "Odlazeći"
+
+#~ msgid "[script]"
+#~ msgstr "[script]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Dodaj potpis skripte"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Sljedeće veze su trenutno aktivne:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Potraži kontakte"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Idi na _datum"
+
+#~ msgid "Go to today"
+#~ msgstr "Idi na današnji dan"
+
+#~ msgid "With _Category"
+#~ msgstr "Uz _kategoriju"
diff --git a/po/hu.po b/po/hu.po
index 805fe1f2c9..0c9fd1581c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2003-09-13 00:45+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -15,6 +15,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Evolution Címjegyzék"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "az összes helyi és aktív távoli mappával"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Mentés másként"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Feladatok "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kártya"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 kártya"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Névjegyek: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Összefoglaló"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Alapértelmezett szinkronizálási cím:"
@@ -97,76 +139,92 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Címjegyzék"
 
-#: 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 "Törlés"
 
-#: 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 "Tulajdonságok..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Névjegy"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Új névjegy készítése"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Új címlista"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Címlista"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Új címlista készítése"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Címjegyzék"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Címjegyzék"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Új feladat létrehozása"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra."
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "A lekérdezést nem lehet elvégezni a DSE gyökérkönyvtárban."
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "A kiszolgáló nem támogatott keresési alapokkal válaszolt"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ez a kiszolgáló nem támogatja az LDAPv3 mintájú információkat"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Hiba a sémainformációk betöltése közben"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "A kiszolgáló nem válaszolt érvényes sémainformációval."
 
@@ -192,17 +250,17 @@ msgstr "%s pingelése"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Személyes"
 
@@ -260,7 +318,7 @@ msgstr "A háttér ehhez a kereséshez elutasította a lekérdezés elvégzésé
 msgid "This query did not complete successfully."
 msgstr "Ez a keresés nem volt sikeres."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -269,7 +327,7 @@ msgstr ""
 "Nem sikerült megnyitni a címjegyzéket. Ellenőrizd, hogy az útvonal\n"
 "létezik-e, és van-e jogod az eléréséhez."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -279,7 +337,7 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "az LDAP-kiszolgáló nem működik."
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -291,7 +349,7 @@ msgstr ""
 "a CVS forrásból kell lefordítanod a programot, miután letöltötted\n"
 "az OpenLDAP-t az alábbi helyről.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -301,28 +359,28 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "a kiszolgáló nem működik."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Nem sikerült megnyitni a címjegyzéket"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sÍrd be %s jelszavát (%s felhasználó)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "Az URI, amit a naptár megjelenít"
@@ -346,16 +404,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  _Támogatott típusok lekérdezése"
 
-#: 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
@@ -370,62 +422,53 @@ msgstr "  _Támogatott típusok lekérdezése"
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "LDAP-beállítás varázsló"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Címjegyzék forrásai"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Címjegyzék forrásai..."
-
-#: 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 "Mindig"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Névtelenül"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -438,54 +481,54 @@ msgstr ""
 "\n"
 "Kattints a \"Befejezés\" gombra a beállítások mentéséhez."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Megkülönböztető _név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "E-mail cím:"
 
-#: 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 ""
 "Az Evolution ezt a megkülönböztető nevet használja majd hitelesítéshez a "
 "kiszolgálón"
 
-#: 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 ""
 "Az Evolution ezt az e-mail címet használja majd hitelesítéshez a kiszolgálón"
 
-#: 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 "Befejezve"
 
-#: 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 "Általános"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Csoport"
 
-#: 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 "Soha"
 
-#: 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"
@@ -501,23 +544,19 @@ msgstr ""
 "használja. Keresd meg a rendszergazdát, amennyiben a kiszolgáló ezen "
 "protokollok valamelyikét használja!"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Egy"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Keresés _hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Keresés"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Kiválasztva:"
-
-#: 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"
@@ -527,7 +566,7 @@ msgstr ""
 "csatlakozik \n"
 "az LDAP-kiszolgálóhoz, ha az támogatja az SSL vagy TLS protokollt."
 
-#: 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"
@@ -545,7 +584,7 @@ msgstr ""
 "kapcsolat\n"
 "már eleve biztonságos."
 
-#: 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"
@@ -559,7 +598,7 @@ msgstr ""
 "sebezhetővé \n"
 "válik a külső támadásokkal szemben."
 
-#: 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 "
@@ -571,7 +610,7 @@ msgstr ""
 "használja az LDAP-keresésekhez, valamint névjegyek létrehozásához és "
 "szerkesztéséhez."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -581,35 +620,35 @@ msgstr ""
 "A kijelzett név meghatározása az utolsó szükséges lépés az LDAP-kiszolgáló "
 "beállítása során."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "1. lépés: Kiszolgáló adatai"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "2. lépés: Kapcsolódás a kiszolgálóhoz"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "3. lépés: Keresés a címtárban"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Al"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Támogatott keresési típusok"
 
-#: 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"
@@ -622,7 +661,7 @@ msgstr ""
 "és mennyi ideig tartson. Ha meg szeretnéd változtatni az értékeket, kérd a "
 "rendszergazda segítségét."
 
-#: 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"
@@ -633,7 +672,7 @@ msgstr ""
 "kezdődik majd. Amennyiben\n"
 "üresen hagyod, a keresés a gyökérkönyvtárban fog kezdődni."
 
-#: 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"
@@ -649,7 +688,7 @@ msgstr ""
 "alaptól lefelé. Egy \"one\" keresési területe csak egy szinttel fog a "
 "keresési alap alá menni.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -667,13 +706,13 @@ msgstr ""
 "a kiszolgálóval kapcsolatban. Amennyiben ezek az információk nem állnak\n"
 "rendelkezésedre, keresd meg a rendszergazdát."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ez az LDAP-kiszolgáló teljes neve. Például \"ldap.encegem.hu\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -684,7 +723,7 @@ msgstr ""
 "Ha túl\n"
 "magasra állítod ezt az értéket, jelentős mértékben lelassul a címjegyzéked."
 
-#: 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 "
@@ -695,7 +734,7 @@ msgstr ""
 "beállítás, igényli az azonosító nélküli bejelentkezési lehetőséget az LDAP-"
 "kiszolgálón."
 
-#: 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"
@@ -704,7 +743,7 @@ msgstr ""
 "Ez a név jelenik majd meg az Evolution mappalistájában.\n"
 "Csak a megjelenítésben van szerepe."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -714,7 +753,7 @@ msgstr ""
 "Ez a név jelenik majd meg az Evolution mappalistájában.\n"
 "Csak a megjelenítésben van szerepe."
 
-#: 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"
@@ -725,28 +764,28 @@ msgstr ""
 "LDAP-kiszolgálóhoz. Az általános portok megtalálhatók a listában. Kérdezd \n"
 "meg a rendszergazdát, hogy melyik portot kell beállítanod."
 
-#: 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 "Itt határozhatod meg, hogy mennyi ideig tartson egy keresés."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TLS használata:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Megkülönböztető névvel (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "E-mail cím használatával"
 
-#: 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 "Amikor csak lehetséges"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -759,60 +798,48 @@ msgstr ""
 "Amennyiben nem vagy biztos benne, hogy ismered ezeket az adatokat, kérdezd "
 "meg a rendszergazdát."
 
-#: 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 "_Megjelenítendő név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: 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 "S_zerkesztés"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Bejelentkezési mód:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Portszám:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Kiszolgáló neve:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Szundi idő (percek)"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kártya"
 
-#: 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"
 
@@ -844,7 +871,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML levél küldése?"
 
 #: 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 "Hozzáadás a címjegyzékhez"
 
@@ -860,7 +887,7 @@ msgstr "Név"
 
 #: 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 "Forrás"
 
@@ -935,7 +962,8 @@ msgstr "Együttműködés"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Névjegyszerkesztő"
 
@@ -944,7 +972,7 @@ msgid "D_epartment:"
 msgstr "_Osztály:"
 
 #: 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 "Részletek"
@@ -1032,16 +1060,27 @@ msgstr "Ka_tegóriák..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Törlés"
 
+#: 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 "S_zerkesztés"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Otthoni:"
@@ -1083,22 +1122,22 @@ msgid "_Web page address:"
 msgstr "_Weblap címe:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Cím"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Szerkeszthető"
 
@@ -2086,9 +2125,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr ""
 
@@ -2102,21 +2141,22 @@ msgid "MSN Messenger"
 msgstr "_Levél"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Szolgáltatás rendelkezésre áll"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Hely:"
@@ -2127,115 +2167,99 @@ msgid "Username"
 msgstr "_Felhasználónév:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Otthoni"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Munka"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Egyéb"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Forrás"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Írható mező"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Megváltoztatva"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Postafiók neve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "A kategóriaszerkesztő nem elérhető."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Ez a névjegy az alábbi kategóriákhoz tartozik:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Névjegy mentése VCard-ként"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Biztos vagy benne, hogy eltávolítod\n"
-"ezeket a névjegyeket?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Biztos vagy benne, hogy\n"
-"eltávolítod ezt a névjegyet?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Üzleti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Csoport"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nem található widget a mezőhöz: `%s'"
@@ -2249,6 +2273,7 @@ msgid "_Edit Full"
 msgstr "_Részletes szerkesztés"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Teljes név:"
 
@@ -2256,6 +2281,22 @@ msgstr "_Teljes név:"
 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 ""
+"Biztos vagy benne, hogy eltávolítod\n"
+"ezeket a névjegyeket?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Biztos vagy benne, hogy\n"
+"eltávolítod ezt a névjegyet?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. cím:"
@@ -2359,24 +2400,28 @@ msgstr "_Megszólítás:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Postafiók neve:"
+msgid "Add IM Account"
+msgstr "Postafiókok"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Postafiókok"
+msgid "_Account name:"
+msgstr "Postafiók neve:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "_Kiszolgáló:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Hely:"
 
+#: 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 "Tagok"
@@ -2397,25 +2442,26 @@ msgstr "Í_rj be egy e-mail címet, vagy húzz egy névjegyet az alábbi listáb
 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 "Címjegyzék"
 
-#: 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 "Új lista"
 
 #. 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 "Címlista-szerkesztő"
 
-#: 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 "Lista mentése VCard-ként"
 
@@ -2468,24 +2514,21 @@ msgid "No contacts"
 msgstr "Névjegyek megjelenítése"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Névjegy"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Névjegyek"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Névjegyek"
+msgstr[1] "Névjegyek"
 
-#: 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 "Lekérdezés"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Hiba a címjegyzék nézetének megnyitásakor"
 
@@ -2497,133 +2540,132 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Hiba a kártya módosításakor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Név ezzel kezdődik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "E-mail ezzel kezdődik"
 
-#: 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 "Kategória"
 
 #. 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 "Bármely mező tartalmazza"
 
-#: 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 "Haladó..."
 
-#: 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 "Típus"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: 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 "Mentés VCard-ként"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Új névjegy..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Új címlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Mappára ugrás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importálás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Névjegyek keresése..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Címjegyzék forrásai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilot beállításai..."
 
-#: 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 "Névjegy továbbítása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Levél küldése ennek a személynek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Boríték nyomtatása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Címjegyzék..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Címjegyzék..."
 
-#: 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 "Kivágás"
 
-#. 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 "Másolás"
 
-#: 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 "Beillesztés"
 
-#: 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 "Aktuális nézet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2636,7 +2678,7 @@ msgstr ""
 "felületet"
 
 #. 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 "Bármelyik kategória"
@@ -2670,8 +2712,6 @@ msgid "Car Phone"
 msgstr "Autótelefon"
 
 #: 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 "Kategóriák"
 
@@ -2680,7 +2720,7 @@ msgid "Company Phone"
 msgstr "Céges telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mail"
 
@@ -2734,6 +2774,7 @@ msgid "Manager"
 msgstr "Főnök"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -2742,7 +2783,7 @@ msgid "Nickname"
 msgstr "Becenév"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Megjegyzés"
 
@@ -2751,7 +2792,7 @@ msgid "Office"
 msgstr "Hivatal"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Szervezet"
 
@@ -2809,17 +2850,17 @@ msgid "Web Site"
 msgstr "Webhely"
 
 #: 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 "Szélesség"
 
 #: 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 "Magasság"
 
 #: 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 "Fókuszban"
 
@@ -2871,92 +2912,95 @@ msgstr ""
 msgid "Adapter"
 msgstr "Csatlakozó"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Kiválasztva"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Megmutatva"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Tagok"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Munka"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Csoport"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Személyes"
+msgid "work"
+msgstr "Munka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Személyes"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "_Beosztás"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Otthoni fax"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Sikerült"
 
-#: 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
@@ -2964,98 +3008,98 @@ msgstr "Sikerült"
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Kapcsolat nélküli tároló"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "A kártya nem található"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "A kártyaazonosító már létezik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "A protokoll nem támogatott"
 
-#: 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 "Megszakítva"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Hitelesítés sikertelen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Hitelesítés szükséges"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS nem elérhető"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "A címjegyzék nem létezik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Egyéb hiba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Mented a változtatásokat?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Elvetés"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Hiba a lista hozzáadásakor"
 
-#: 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
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Hiba a kártya hozzáadásakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Hiba a lista módosításakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Hiba a kártya módosításakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Hiba a lista törlésekor"
 
-#: 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
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Hiba a kártya törlésekor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3065,7 +3109,7 @@ msgstr ""
 "kerül egy %d új ablak is.\n"
 "Valóban meg szeretnéd jeleníteni az összes ilyen címkártyát?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3074,54 +3118,54 @@ msgstr ""
 "%s már létezik\n"
 "Szeretnéd felülírni?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fájlmentési hiba %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 "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Névjegy áthelyezése"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Névkártya másolása a következő helyre"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Névjegyek áthelyezése"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Névjegyek másolása"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Névjegyek kijelölése a címjegyzékből"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Több VKártya"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKártyája"
@@ -3158,36 +3202,33 @@ msgstr "Cím hozzáadása a létező %s névjegyhez"
 msgid "Querying Address Book..."
 msgstr "A címjegyzék lekérdezése..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Névjegy adatainak szerkesztése"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "E-mail cím összefésülése"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "és %d egyéb kártya"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "és egy másik kártya"
+msgid_plural "and %d other contacts."
+msgstr[0] "és egy másik kártya"
+msgstr[1] "és egy másik kártya"
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Teljes _fejléc megjelenítése"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Névjegy mentése VCard-ként"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Mentés a címjegyzékbe"
 
@@ -3337,7 +3378,7 @@ msgstr "Margók"
 msgid "Number of columns:"
 msgstr "Oszlopok száma:"
 
-#: 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 "Beállítások"
 
@@ -3521,7 +3562,7 @@ msgid "Unnamed List"
 msgstr "Névtelen lista"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Írd be a jelszót"
@@ -3602,7 +3643,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution Teszt komponens"
 
 #: 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"
@@ -3648,24 +3689,24 @@ msgstr "Szundi idő (percek)"
 msgid "_Edit appointment"
 msgstr "_Találkozó szerkesztése"
 
-#: 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 "Megnyitás"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Nincs leírás."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3674,12 +3715,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: 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"
@@ -3691,7 +3732,7 @@ msgstr ""
 "lett beállítva. Az Evolution a szokásos emlékeztető\n"
 "párbeszédablakot fogja ehelyett megjeleníteni."
 
-#: 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 "
@@ -3708,7 +3749,7 @@ msgstr ""
 "\n"
 "Biztosan futtatni szeretnéd ezt a programot?"
 
-#: 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 "Ne kérdezzen meg többet ezzel a programmal kapcsolatban."
 
@@ -3882,13 +3923,13 @@ msgstr "Megjegyzés tartalmazza"
 msgid "Location contains"
 msgstr "Leírás tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Ki nem válogatott"
 
-#: 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 "Naptár"
 
@@ -3910,7 +3951,7 @@ msgid "Purge events older than"
 msgstr "visszatér kisebb mint"
 
 #: 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 "naponként"
 
@@ -3921,7 +3962,7 @@ msgstr "%Y %B %d, %A"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%b %d, %a"
 
@@ -3943,75 +3984,75 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Új találkozó"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Találkozó"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Új találkozó létrehozása"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "É_rtekezlet"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Új értekezlet összehívási kérés létrehozása"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Új egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "_Egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Új egész napos esemény létrehozása"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Naptár:"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Új mappa létrehozása"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4041,11 +4082,6 @@ msgstr "Hétnézet"
 msgid "Month View"
 msgstr "Hónapnézet"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Egyéni nézet"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Hiba történt a naptár megnyitása közben"
@@ -4063,16 +4099,16 @@ msgstr "Hozzáférés megtagadva a naptár megnyitásához"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nem sikerült megnyitni a mappát '%s'-ben"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "Az URI, amit a naptár megjelenít"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "A megjelenítendő nézettípus"
 
@@ -4136,11 +4172,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "-szer minden"
 
-#: 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 "óránként"
 
-#: 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 "percenként"
 
@@ -4163,11 +4199,11 @@ msgstr "Alapok"
 msgid "Date/Time:"
 msgstr "Dátum és idő:"
 
-#: 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 "Levél megjelenítése"
 
-#: 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 "Hangjelzés"
 
@@ -4175,17 +4211,17 @@ msgstr "Hangjelzés"
 msgid "Reminders"
 msgstr "Emlékeztetők"
 
-#: 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 "Program futtatása"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Levél küldése"
 
 #: 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 "Összefoglaló:"
@@ -4216,7 +4252,7 @@ msgid "hour(s)"
 msgstr "óra"
 
 #: 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 "perc"
 
@@ -4226,8 +4262,8 @@ msgstr "találkozó kezdete"
 
 #. 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 "Engedélyezve"
 
@@ -4243,19 +4279,19 @@ msgstr "Ne importálja"
 
 #: 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 "Tiltás"
 
 #: 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 "Engedélyezés"
 
@@ -4279,7 +4315,7 @@ msgstr "30 perc"
 msgid "60 minutes"
 msgstr "60 perc"
 
-#: 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 "Figyelmeztetések"
 
@@ -4304,7 +4340,7 @@ msgid "Days"
 msgstr "nappal"
 
 #: 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_ngedélyezés"
 
@@ -4399,7 +4435,7 @@ msgid "Wednesday"
 msgstr "Szerda"
 
 #: 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 "Munkahét"
 
@@ -4446,7 +4482,6 @@ msgid "_Fri"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "Á_ltalános"
 
@@ -4548,7 +4583,7 @@ msgstr ""
 "Kattints a \"Befejezés\" gombra a beállítások mentéséhez."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Feladatlista"
@@ -4721,28 +4756,28 @@ msgstr "%s  Változtattál. Elveted a változásokat, és frissíted a szerkeszt
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Érvényesítési hiba: %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 " - "
 
-#: 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 " (Befejezve"
 
-#: 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 "Befejezve"
 
-#: 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 " (Esedékes "
 
-#: 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 "Esedékes "
 
@@ -4778,8 +4813,9 @@ msgstr "Napló bejegyzés - %s"
 msgid "No summary"
 msgstr "Nincs összegzés"
 
-#: 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 "Mentés másként..."
 
@@ -4796,35 +4832,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Nem sikerült megszerezni a legfrissebb változatot!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Címzett címe"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Címzett címe"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Naptár"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Új feladat"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4853,19 +4874,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Tényleg törölni akarod ezt a névtelen naplóbejegyzést?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Tényleg törölni akarsz %d találkozót?"
+#, 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] "Tényleg törölni akarsz %d találkozót?"
+msgstr[1] "Tényleg törölni akarsz %d találkozót?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Tényleg törölni akarsz %d feladatot?"
+#: 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] "Tényleg törölni akarsz %d feladatot?"
+msgstr[1] "Tényleg törölni akarsz %d feladatot?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Tényleg törölni akarsz %d naplóbejegyzést?"
+#: 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] "Tényleg törölni akarsz %d naplóbejegyzést?"
+msgstr[1] "Tényleg törölni akarsz %d naplóbejegyzést?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4932,7 +4959,7 @@ msgstr "A feladat végrehajtója:"
 msgid "Enter Delegate"
 msgstr "Végrehajtó megadása"
 
-#: 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 "Találkozó"
 
@@ -5006,8 +5033,6 @@ msgstr "_Naptár:"
 
 #: 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 "Besorolás"
 
@@ -5058,13 +5083,13 @@ msgstr "_Kezdés időpontja:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nincs"
 
@@ -5121,13 +5146,13 @@ msgid "Member"
 msgstr "Tag"
 
 #: 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
@@ -5311,7 +5336,7 @@ msgid "_No recurrence"
 msgstr "_Nincs ismétlődés"
 
 #: 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 "_Eltávolítás"
 
@@ -5353,7 +5378,7 @@ msgstr ""
 "\n"
 "Akarod menteni a változásaidat?"
 
-#: 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 "_Változások elvetése"
 
@@ -5361,6 +5386,28 @@ msgstr "_Változások elvetése"
 msgid "Save Event"
 msgstr "Esemény mentése"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Válassz importálót"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Címzett címe"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Naptár"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Új feladat"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Az értekezlet adatai létrejöttek. Elküldöd?"
@@ -5390,39 +5437,39 @@ msgstr "% kész"
 #: 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 "Befejezve"
 
 #: 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 "Magas"
 
 #: 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 "Folyamatban"
 
 #: 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 "Alacsony"
 
 #: 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 "Normál"
 
 #: 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 "Nem indult még el"
 
@@ -5437,7 +5484,7 @@ msgstr "Nem meghatározott"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Befejezés dátuma:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5481,9 +5528,9 @@ msgstr "Nem sikerült megnyitni a címjegyzéket"
 msgid "Con_fidential"
 msgstr "Bi_zalmas"
 
-#: 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 "Leírás:"
 
@@ -5493,11 +5540,13 @@ msgid "Folder:"
 msgstr "_Mappa:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Ke_zdés dátuma:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "Le_járat:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5557,138 +5606,112 @@ msgid "Weekly"
 msgstr "Hét"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d nappal"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 nappal"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d hét"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 hét"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d órával"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 órával"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d perccel"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d nappal"
+msgstr[1] "%d nappal"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 perccel"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d hét"
+msgstr[1] "%d hét"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d másodperc"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d órával"
+msgstr[1] "%d órával"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 másodperc"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d perccel"
+msgstr[1] "%d perccel"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Levél küldése"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d másodperc"
+msgstr[1] "%d másodperc"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ismeretlen műveletet készülsz végrehajtani"
 
-#: 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 a találkozó kezdete előtt"
 
-#: 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 a találkozó kezdete után"
 
-#: 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 a találkozó kezdetekor"
 
-#: 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 a találkozó vége előtt"
 
-#: 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 a találkozó vége után"
 
-#: 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 a találkozó végén"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s-kor"
 
-#: 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 ismeretlen kiváltó okra"
 
-#: 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 "Nyilvános"
 
-#: 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 "Személyes"
 
-#: 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 "Bizalmas"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Leírás:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Határidő"
 
-#: 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 "Kezdés dátuma"
 
-#: 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 "Összefoglaló"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "szín"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Találkozó"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Szabad"
@@ -5724,141 +5747,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 "Igen"
 
-#: 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 "Nem"
 
 #. 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 "Ismeretlen"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Ismétlődő"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Hozzárendelve"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Kijelölt objektumok törlése"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Objektumok frissítése"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Új _találkozó..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Ú_j egész napos esemény"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Új értekezlet"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Új feladat"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Nyomtatás..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Beillesztés"
-
-#: 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 "Ugrás a _mai napra"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Ugrás dátumra..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "Szabad/foglalt információ _közzététele"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Megnyitás"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "M_entés másként..."
-
-#: 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 "_Kivágás"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Másolás"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "Értekezlet _tervezése..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Továbbítás iCalendarként..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Az _előfordulás törlése"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Az ö_sszes előfordulás törlése"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Beállítások..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5903,33 +5824,86 @@ 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 "Kijelölt objektumok törlése"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Objektumok frissítése"
+
+#: 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 "_Megnyitás"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Levél _megnyitása"
 
-#: 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 "M_entés másként..."
+
+#: 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 "_Nyomtatás..."
+
+#: 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 "_Kivágás"
+
+#: 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 "_Másolás"
+
+#: 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 "_Beillesztés"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Feladat kiosztása"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Továbbítás iCalendarként"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Megjelölés készként"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Kijelölt feladatok megjelölése készként"
 
-#: 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 "_Kijelölt feladatok törlése"
 
-#: 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 "Kattints ide új feladat hozzáadásához"
 
@@ -5938,38 +5912,101 @@ msgstr "Kattints ide új feladat hozzáadásához"
 msgid "% Complete"
 msgstr "% kész"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Ébresztők"
-
-#: 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 "Kész"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Befejezés dátuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Lejárat"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Földrajzi hely"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioritás"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Kezdés dátuma"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Feladatrendezés"
 
-#: 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 "Új _találkozó..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Ú_j egész napos esemény"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Új értekezlet"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Új feladat"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "_Szál kijelölése"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Törlés..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "Szabad/foglalt információ _közzététele"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Mappába másolás..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Á_thelyezés mappába..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "Értekezlet _tervezése..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Továbbítás iCalendarként..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Az _előfordulás törlése"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Az ö_sszes előfordulás törlése"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Ugrás a _mai napra"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Ugrás dátumra..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Beállítások..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6001,26 +6038,26 @@ msgstr "%02i perces osztás"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
 #. 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 "de"
 
 #. 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 "du"
@@ -6029,419 +6066,415 @@ msgstr "du"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Igen. (Összetett ismétlődés)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Minden nap"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "%d naponta"
+msgid_plural "Every %d days"
+msgstr[0] "Minden nap"
+msgstr[1] "Minden nap"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Minden héten"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "%d hetente"
+msgid_plural "Every %d weeks"
+msgstr[0] "Minden héten"
+msgstr[1] "Minden héten"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Minden héten ekkor"
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "%d hetente ekkor"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Minden héten ekkor"
+msgstr[1] "Minden héten ekkor"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " és "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s napján"
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s napján"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "minden hónapban"
+msgid_plural "every %d months"
+msgstr[0] "minden hónapban"
+msgstr[1] "minden hónapban"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "%d havonta"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Minden évben"
+msgid_plural "Every %d years"
+msgstr[0] "Minden évben"
+msgstr[1] "Minden évben"
 
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "%d évente"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr "összesen ennyiszer: %d"
+#: 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] "összesen ennyiszer: %d"
+msgstr[1] "összesen ennyiszer: %d"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", véget ér"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Kezdődik:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Vége:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Befejezve:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Határidő:</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 információ"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: 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 "Ismeretlen személy"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Olvasd el a következőket, és válassz ki egy műveletet az alábbi menüből."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Hely:"
+
 #. 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 "Állapot:"
 
-#: 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 "Elfogadva"
 
-#: 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 "Kísérletileg elfogadva"
 
-#: 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 "Elutasítva"
 
-#: 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 "Válassz egy műveletet:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Frissítés"
 
-#: 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 "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt információ küldése"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Válaszoló állapotának frissítése"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: 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> információt tett közzé az értekezletről."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Információ az értekezletről"
 
-#: 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> arra kér, hogy vegyél részt a(z) %s értekezleten."
 
-#: 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> arra kér, hogy vegyél részt az értekezleten."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Javaslat értekezletre"
 
-#: 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> szeretne hozzátenni egy létező értekezlethez."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Értekezlet frissítése"
 
-#: 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> szeretné megkapni a legújabb adatokat az értekezletről."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Értekezletfrissítési kérés"
 
-#: 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> válaszolt egy értekezlet-összehívási kérésre."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Válasz az értekezletre"
 
-#: 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> lemondta az értekezletet."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Értekezlet lemondása"
 
-#: 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> egy értelmetlen levelet küldött."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Rossz értekezletfelhívás"
 
-#: 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> feladatinformációt tett közzé."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Feladatinformáció"
 
-#: 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> arra kér, %s hogy végezz el egy feladatot."
 
-#: 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> arra kér, hogy hajts végre egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: 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> szeretne hozzátenni egy létező feladathoz."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Feladat frissítése"
 
-#: 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> szeretné megkapni a legújabb adatokat a feladatról."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Feladatfrissítési felhívás"
 
-#: 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> válaszolt egy feladatfelkérésre."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Válasz feladatra"
 
-#: 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> törölte a feladatot."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Feladat lemondása"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Rossz feladatüzenet"
 
-#: 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> szabad/foglalt információt tett közzé."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt információ"
 
-#: 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> kéri a szabad/foglalt adataidat."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt kérés"
 
-#: 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> válaszolt egy szabad/foglalt kérésre."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt válasz"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt üzenet"
 
-#: 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 "A levél úgy tűnik, nem megfelelően formázott"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "A levél csak nem támogatott kéréseket tartalmaz."
 
-#: 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 "A melléklet nem tartalmaz érvényes naptárüzenetet"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "A naptárfájlt nem lehetett frissíteni!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Frissítés kész\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 ""
 "A résztvevő állapotát nem lehetett frissíteni, mert az elem nem létezik többé"
 
-#: 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 "Az objektum érvénytelen és nem lehet frissíteni\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 ""
 "A válasz oylantól érkezett, aki nem résztvevő. Hozzáadod a résztvevőkhöz?"
 
-#: 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 ""
 "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\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 "Hiba történt a CORBA-rendszerben\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Az elem nem található\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 "Nincsenek megfelelő jogosultságaid a naptár frissítéséhez\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "A résztvevő állapotát nem lehetett frissíteni!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Törlés befejezve"
 
-#: 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 "Elküldve!\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 "Az elemet nem lehetett elküldeni!\n"
 
@@ -6576,7 +6609,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -6662,12 +6695,12 @@ msgstr "_Prioritás:"
 msgid "Web Page:"
 msgstr "Oldal"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kattints ide új feladat hozzáadásához"
 
-#: 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"
@@ -6677,7 +6710,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"
@@ -6685,12 +6718,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyitása %s-kor"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6699,47 +6732,49 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Képek betöltése"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Képek betöltése"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nincsenek találkozók."
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Képek betöltése"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Megnyitás ezzel: %s..."
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6761,45 +6796,46 @@ msgid "February"
 msgstr "február"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Dátumra ugrás"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "január"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "július"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "június"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "március"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "május"
 
-#: 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 "október"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Válassz neveket"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "szeptember"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Ugrás mára"
+msgid "_Select Today"
+msgstr "Válassz mappát"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6881,7 +6917,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7038,81 +7074,81 @@ msgid "Sa"
 msgstr "Szo"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Kijelölt nap (%Y %b %d, %a)"
 
-#: 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 "%b %d, %a"
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%Y %d, %a"
 
-#: 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 "%Y %b %d, %a"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Kijelölt hét (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Kijelölt hónap (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Kijelölt év (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Feladat"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Állapot: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritás: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Százalékos készenlét: %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 "Kategóriák: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Névjegyek: "
 
-#: 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 "Nyomtatási kép"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Elem nyomtatása"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Nyomtatás beállítása"
 
@@ -7121,39 +7157,39 @@ msgstr "Nyomtatás beállítása"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "Feladatlista"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8797,7 +8833,7 @@ msgstr "Nem lehet létrehozni az ideiglenes tároló útvonalát"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nem sikerült megnyitni a gyorstár könyvtárát: %s %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8808,7 +8844,7 @@ msgstr ""
 "A további műveletek ezen a kiszolgálón nem lesznek újra lejátszva,\n"
 "amikor ismét kapcsolódsz a hálózathoz."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8819,7 +8855,7 @@ msgstr ""
 "%s\n"
 "Az ebben a mappában történt változások nem lesznek újraszinkronizálva."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Újraszinkronizálás a kiszolgálóval"
 
@@ -8836,7 +8872,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "%s mappa előkészítése a kapcsolat nélküli módhoz"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "A művelet befejezéséhez hálózati kapcsolattal kell rendelkezned"
 
@@ -8951,30 +8987,34 @@ msgstr "a (match-all) egy darab logikai eredményt vár"
 msgid "Performing query on unknown header: %s"
 msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nem támogatott művelet: levél hozzáfűzése: %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nem támogatott művelet: keresés kifejezés szerint: %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nem támogatott művelet: keresés uid szerint: %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Levelek áthelyzése"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Levelek másolása"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d levél letöltése"
@@ -9009,7 +9049,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 "Megszakítva"
 
@@ -9400,7 +9441,7 @@ msgstr "A hivatkozott azonosító adatok lejártak."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Rossz hitelesítési válasz a kiszolgálótól"
 
@@ -9602,7 +9643,7 @@ msgstr "Értelmezési hiba"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Kiszolgáló: %s,  Típus: %s "
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült megnyitni a könyvtárat: Érvénytelen művelet ezen a tárolón"
@@ -9612,22 +9653,23 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült létrehozni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Kuka"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "június"
@@ -9861,17 +9903,17 @@ msgstr "Nincs ilyen levél (%s) ezen a helyen: %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
@@ -9907,33 +9949,32 @@ msgstr "Szűrők alkalmazása az új levelekre ennek a kiszolgálónak az INBOX-
 msgid "Automatically synchronize remote mail locally"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Kiszolgáló neve"
+msgid "Address Book And Calendar"
+msgstr "Címjegyzék"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "Keresés _kiindulópontja:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Jelszó"
 
-#: 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."
@@ -9941,8 +9982,8 @@ msgstr ""
 "Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
 "kiszolgálóval."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Sűrű köd"
@@ -9950,12 +9991,12 @@ msgstr "Sűrű köd"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "A művelet leállítva"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
@@ -10013,12 +10054,12 @@ msgstr "A mappa megsemmisült, és újra létre lett hozva a kiszolgálón."
 msgid "Scanning for changed messages"
 msgstr "Megváltozott levelek keresése"
 
-#: 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 "Nem lehet elhozni a levelet: %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
@@ -10034,25 +10075,25 @@ msgstr ""
 "Nem sikerült betölteni a levelet: %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 "Nincs ilyen levél"
 
-#: 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 "Ez a levél jelenleg nem elérhető"
 
-#: 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 "Összefoglaló adatok letöltése az új levelekhez."
 
-#: 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 "Nem található a levéltörzs a FETCH válaszban."
 
@@ -10128,18 +10169,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Levélolvasás és -tárolás IMAP-kiszolgálókon."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP-kiszolgáló"
 
-#: 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-szolgáltatás a következőnek %s, ezen a címen: %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
@@ -10149,15 +10190,15 @@ msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nem sikerült csatlakozni %s %d portjához: %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
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "TLS nem elérhető"
 
-#: 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
@@ -10165,51 +10206,51 @@ msgstr "TLS nem elérhető"
 msgid "Connection cancelled"
 msgstr "Kapcsolat megszakítva"
 
-#: 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 ""
 "Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
 "kiszolgálóhoz: %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 kiterjesztés nem támogatott"
 
-#: 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-tárgyalás sikertelen"
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nem sikerült csatlakozni %s %d portjához: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP-kiszolgáló nem támogatja a kért %s hitelesítési típust"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s hitelesítési típus nem támogatott"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAdd meg %s@%s IMAP-jelszavát!"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Nem adtál meg jelszót."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10220,32 +10261,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
+
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ismeretlen szülőmappa: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A szülőmappa nem tartalmazhat almappákat"
 
@@ -10278,20 +10320,20 @@ msgid "Index message body data"
 msgstr "Levél küldése ennek a személynek"
 
 #. $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 "postaláda:%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)"
@@ -10352,7 +10394,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"
@@ -10401,8 +10443,8 @@ msgstr "Nem sikerült '%s' mappaösszegzőfájt törölni: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem sikerült '%s' mappaindexfájlt törölni: %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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nem sikerült '%s' mappaösszegzőfájt törölni: %s"
@@ -10432,14 +10474,14 @@ msgstr "A levél tartalma érvénytelen"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' mappa nem létezik."
@@ -10458,7 +10500,7 @@ msgstr " `%s' nem maildir könyvtár."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nem sikerült törölni a mappát: `%s': %s"
@@ -10467,28 +10509,28 @@ msgstr "Nem sikerült törölni a mappát: `%s': %s"
 msgid "not a maildir directory"
 msgstr "nem maildir könyvtár"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nem sikerült pásztázni a mappát: `%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 "Nem sikerült megnyitni a maildir könyvtár elérési útját: %s: %s "
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Mappa konzisztenciájának ellenőrzése"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Új levelek keresése"
 
-#: 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
@@ -10536,7 +10578,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Levélírás sikertelen: sérült postafiók?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Nem könyvtárat létrehozni ezen a néven"
@@ -10567,32 +10609,32 @@ msgstr "`%s' nem közönséges fájl."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem üres. Nem törölhető."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "A kártyaazonosító már létezik"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "A megadott mappanév nem jó: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
@@ -10636,7 +10678,7 @@ msgstr "Nem sikerült lezárni a forrásmappát %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nem sikerült bezárni ezt az ideiglenes mappát: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem sikerült átnevezni ezt a mappát: %s"
@@ -10679,14 +10721,14 @@ msgstr "MH levél hozzáfűzése megszakítva"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Nem sikerült létrehozni a mappát: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
@@ -10970,47 +11012,47 @@ msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nem lehet a mappát a saját almappájába áthelyezni."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Ismeretlen hiba: %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 "Nincs ilyen mappa: %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 "Nem sikerült a csoportot letölteni: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nem sikerült elküldeni a levelet: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Az NNTP-parancs sikertelen: %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: Új üzenetek keresése"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ismeretlen válasz a kiszolgálótól: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Felhasználó megszakította"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Művelet sikertelen: %s"
@@ -11057,7 +11099,7 @@ msgstr "Törlés a kiszolgálóról %s nap múlva"
 msgid "Disable support for all POP3 extensions"
 msgstr "Az összes POP3-kiterjesztés tiltása"
 
-#: 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"
 
@@ -11149,7 +11191,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs `%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11202,12 +11244,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levélküldés a sendmail programon keresztül"
 
-#: 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 "A levélkézbesítés egy távoli SMTP-kiszolgálón keresztül történik.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11325,13 +11368,14 @@ msgid "server does not appear to support SSL"
 msgstr "A kiszolgáló úgy tűnik, nem támogatja az SSL-t."
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "Időtúllépés a STARTTLS kérésnél: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "Hibás STARTTLS válasz"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11365,154 +11409,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP-levélküldés %s kiszolgálón át"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Nem lehet elküldeni a levelet: nincs címzett."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Nem lehet elküldeni a levelet: a feladó címe érvénytelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Levél küldése"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elküldeni a levelet: nincs címzett."
 
-#: 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 "Nem lehet elküldeni a levelet: egy vagy több érvénytelen címzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP-üdvözlet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "Időtúllépés az HELO kérésnél: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "Hibás HELO válasz"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP-hitelesítés"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hitelesítési objektum létrehozásakor."
 
-#: 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 "Időtúllépés az AUTH kérésnél: %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 "Az IMAP-parancs sikertelen: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH kérés sikertelen."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "Az IMAP-parancs sikertelen: %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 "Rossz hitelesítési válasz a kiszolgálótól.\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 "Időtúllépés a MAIL FROM kérésnél: %s: a levél nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "Hibás MAIL FROM válasz"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "Az IMAP-parancs sikertelen: %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 "Időtúllépés az RCPT TO kérésnél: %s: a levél nem ment el"
 
-#: 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> sikertelen"
 
-#: 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 "Időtúllépés a DATA kérésnél: %s: a levél nem ment el"
 
 #. 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 "Hibás DATA válasz"
-
-#: 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 ""
-"Időtúllépés a DATA küldésénél: a levél véget ért: %s: a levél nem ment el"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA lezárás válasz hiba"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Időtúllépés az RSET kérésnél: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "Hibás RSET válasz"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "Időtúllépés az QUIT kérésnél: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "Hibás QUIT válasz"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f K"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: 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 "melléklet"
 
-#: 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 "Eltávolítja a kiválasztott elemeket a mellékletlistáról"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Csatolás..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Fájl csatolása a levélhez"
 
-#: 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 "Nem sikerült csatolni a fájlt: %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 "Nem sikerült csatolni a fájlt: %s: nem közönséges fájl"
@@ -11534,20 +11581,20 @@ msgstr "MIME-típus:"
 msgid "Suggest automatic display of attachment"
 msgstr "Javasolja a melléklet automatikus megjelenítését"
 
-#: 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 "Be kell állítanod egy postafiókot, mielőtt levelet küldhetnél."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Címzett címe"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Ez a mappa nem tartalmazhat leveleket."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Címjegyzékben való kereséshez kattints ide"
 
@@ -11558,45 +11605,45 @@ msgstr "Címjegyzékben való kereséshez kattints ide"
 #. * 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 "Válaszcím:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Feladó:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Címzett:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Írd be a levél címzettjét"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: 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 "Írd be, kik kapjanak másolatot a levélről"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Rejtett másolat:"
 
-#: 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."
@@ -11607,11 +11654,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Címzett:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<kattints ide a mappa kiválasztásához>"
@@ -11620,19 +11667,19 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Attach file(s)"
 msgstr "Fájl csatolása"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11641,30 +11688,30 @@ msgstr ""
 "Fájlbeolvasási hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "A fájl létezik, felülírod?"
 
-#: 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 "Fájlmentési hiba: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fájlbetöltési hiba: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fájlelérési hiba: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11673,7 +11720,7 @@ msgstr ""
 "Nem sikerült keresni a fájlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11682,7 +11729,7 @@ msgstr ""
 "Nem sikerült csonkolni a  fájlt: %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"
@@ -11691,7 +11738,7 @@ msgstr ""
 "Nem sikerült másolni a fájlleírót: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11700,7 +11747,7 @@ msgstr ""
 "Hiba a levelek automatikus mentése közben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11710,7 +11757,7 @@ msgstr ""
 "fájlokat.\n"
 "Szeretnéd megkísérelni a visszaállításukat?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11722,42 +11769,47 @@ msgstr ""
 "Szeretnéd menteni a változtatásokat?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Névtelen levél)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Figyelem: Módosított levél"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Aláírás:"
-
-#: 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 "Automatikusan létrehozott"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Aláírás:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Levél írása"
 
-#: 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."
@@ -11765,7 +11817,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "Nem lehetett aktiválni a címkiválasztó kontrollt."
 
-#: 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"
@@ -11777,7 +11829,7 @@ msgstr ""
 "Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
 "libgtkhtml van-e telepítve.\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."
@@ -11785,7 +11837,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "A HTML-szerkesztő komponens aktiválása sikertelen."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11915,7 +11967,7 @@ msgstr ""
 "Amikor olyan levelet kapsz, amely visszaigazolást kér az elolvasásról, mit "
 "tegyen az Evolution?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11923,15 +11975,15 @@ msgstr ""
 "A megadott néven már létezik fájl.\n"
 "Felülírod?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Felülírod a fájlt?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Jelszó megjegyzése"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
@@ -12014,13 +12066,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12029,118 +12081,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 másodperce"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d másodperce"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 másodperce"
+msgstr[1] "1 másodperce"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 perce"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d perce"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 perce"
+msgstr[1] "1 perce"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 órája"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d órája"
+msgid_plural "%d hours ago"
+msgstr[0] "1 órája"
+msgstr[1] "1 órája"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 napja"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d napja"
+msgid_plural "%d days ago"
+msgstr[0] "1 napja"
+msgstr[1] "1 napja"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 hete"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 hete"
+msgstr[1] "1 hete"
 
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d hete"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 hónapja"
+msgid_plural "%d months ago"
+msgstr[0] "1 hónapja"
+msgstr[1] "1 hónapja"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d hónapja"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 éve"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d éve"
+msgid_plural "%d years ago"
+msgstr[0] "1 éve"
+msgstr[1] "1 éve"
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Kötelező kiválasztani a dátumot."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<kattints ide a dátum kiválasztásához>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "most"
 
 #. 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 "%Y %b %d"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Idő megadása"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Szűrő szabályok"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Meg kell adnod egy fájlnevet."
 
-#: 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 "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Fájl kiválasztása"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Akkor"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Határidő:</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Meg kell adnod egy mappát."
 
-#: 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 "Mappa kiválasztása"
 
@@ -12154,23 +12194,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 "Fontos"
 
 #. 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 "Teendő"
 
 #. 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 "Később"
 
-#: 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 "Teszt"
 
@@ -12178,59 +12218,64 @@ msgstr "Teszt"
 msgid "You must name this filter."
 msgstr "Meg kell adnod a szűrő nevét."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Szabály neve:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Keresési feltételek"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Határidő:</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Művelet végrehajtása,"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "ha minden feltétel teljesül"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "ha bármelyik feltétel teljesül"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "bejövő"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "kimenő"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Összehasonlítás"
+#, fuzzy
+msgid "    "
+msgstr "      "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Szűrők szerkesztése"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Szűrő szabályok"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "VMappák szerkesztése"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "VMappa források"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Összehasonlítás"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Bejövő"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Kimenő"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12238,7 +12283,7 @@ msgstr ""
 "A levél dátuma az itt megadott dátummal\n"
 "lesz összehasonlítva."
 
-#: 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."
@@ -12246,7 +12291,7 @@ msgstr ""
 "A levél dátuma a szűrő futtatásának dátumához\n"
 "viszonyított dátumhoz lesz hasonlítva."
 
-#: 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."
@@ -12254,59 +12299,51 @@ msgstr ""
 "A levél dátuma a szűrő futtatásakor aktuális\n"
 "dátummal lesz összehasonlítva."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtuális mappák"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "az idő mostantól számítva"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "óta"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "hónap"
 
-#: 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 "másodperc"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "csak a megadott mappák"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "a pontos idő most"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "megadott idő"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "VMappa források"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "hét"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "az összes aktív távoli mappával"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "az összes helyi és aktív távoli mappával"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "az összes helyi mappával"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "év"
 
@@ -12440,7 +12477,7 @@ msgstr "nem megjelölt"
 msgid "Junk Test"
 msgstr "június"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Címke"
@@ -12472,8 +12509,9 @@ msgid "Move to Folder"
 msgstr "Áthelyezés mappába"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Üzenet bevezetése egy héjparancsba"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Kilépés a programból"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12507,23 +12545,24 @@ msgstr "visszatér nagyobb mint"
 msgid "returns less than"
 msgstr "visszatér kisebb mint"
 
-#: 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 "Program futtatása:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pontszám"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Feladó"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Állapot beállítása"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Héjparancs"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Méret (kB)"
@@ -12548,9 +12587,9 @@ msgstr "kezdete"
 msgid "Stop Processing"
 msgstr "Feldolgozás leállítása"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Tárgy"
@@ -12559,17 +12598,13 @@ msgstr "Tárgy"
 msgid "Unset Status"
 msgstr "Állapot nincs beállítva"
 
-#: 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 "A(z) %s szabály megnevezés nem egyedi, kérlek válassz másikat."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Szabályok"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Szabály hozzáadása"
 
@@ -12581,8 +12616,9 @@ msgstr "Szabály szerkesztése"
 msgid "Rule name"
 msgstr "Szabály neve"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Pontszámszabályok"
 
 #: filter/searchtypes.xml.h:1
@@ -12617,15 +12653,20 @@ msgstr "A tárgy tartalmazza"
 msgid "Subject does not contain"
 msgstr "A tárgy nem tartalmazza"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuális mappák"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Meg kell adnod a vmappa nevét."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Legalább egy mappát meg kell adnod, mint forrást."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "VMappa-forrás"
 
@@ -12678,8 +12719,8 @@ msgstr "Evolution Levelező mappamegjelenítő"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Levelező beállító kontroll"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Levél"
@@ -12688,53 +12729,50 @@ msgstr "Levél"
 msgid "Mail Accounts"
 msgstr "Postafiókok"
 
-#: 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 "Levelezés beállításai"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Tényleg törölni akarod ezt a postafiókot?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Nem töröl"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Alapértelmezett]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Postafiók neve:"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: 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 "Névtelen"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Meg kell adnod egy érvényes parancsfájlnevet."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[parancsfájl]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Nyelv(ek)"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Parancsfájl-aláírás hozzáadása"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Aláírás hozzáadása"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Aláírás(ok)"
 
@@ -12790,7 +12828,7 @@ msgstr ""
 "Nem sikerült megnyitni az ehhez a postafiókhoz tartozó piszkozatok mappát.\n"
 "Szeretnéd használni az alapértelmezett piszkozatok mappát?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuális mappa gyártása a keresésből"
 
@@ -12824,331 +12862,361 @@ msgstr "_Következő olvasatlan levél"
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kiválasztásához>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Add meg, hogy hol hozod létre a mappát."
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Mappanév:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "VMappák"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Beérkezett levelek"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "%s mappa eltávolítása"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "%s mappa megnyitása"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Levelek áthelyezése %s-be"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Levelek másolása %s-be"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Válassz mappát"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "%s mappa tárolása"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nem sikerült törölni a mappát: `%s': %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" törlése"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" mappa átnevezése erre:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Mappa átnevezése"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Már létezik \"%s\" nevű mappa. Használj más nevet."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Nézet"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Megnyitás új ablakban"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Áthelyezés"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztés új levélként..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Válasz a _listának"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Válasz _mindenkinek"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "Továbbítás"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Követés..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Befejezve _Jelölő"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Jelölő törlése"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Visszaállítás"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "Á_thelyezés mappába..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Másolás mappába..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "_Szűrők alkalmazása"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Szűrő szabályok"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "S_zabály gyártása levélből"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VMappa a _tárgyra"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _címzettekre"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelezőlistára"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Szű_rő a tárgyra"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Szűrő a f_eladóra"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Szűrő a _címzettekre"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Szűrő a f_eladóra"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Levél nyomtatása"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Hivatkozás címének másolása"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kattints ide új feladat hozzáadásához"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Találatok:"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Hozzárendelve"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "Aláírás szerkesztése"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Aláírás mentése"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13157,79 +13225,79 @@ msgstr ""
 "Az input_token érvénytelen aláírást tartalmaz, vagy az aláírás nem "
 "ellenőrizhető."
 
-#: 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
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Megszakítva"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP titkosítás"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "A tanúsítvány még nem érvényes"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Lejárt elemek:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Megtekintés beágyazva"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Elrejtés"
@@ -13239,128 +13307,164 @@ msgstr "Elrejtés"
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "%s levél letöltése"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Hibás külső törzsrész."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutató FTP-helyre (%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 "Mutató helyi fájlra (%s), amely \"%s\" helyen érvényes"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutató hely fájlra (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutató távoli adatra (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutató ismeretlen külső adatra (\"%s\" típus)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Levelek áthelyzése"
 
-#: 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 "Feladó"
 
-#: 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 "Válaszcím"
 
-#: 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 "Címzett"
 
-#: 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 "Másolat"
 
-#: 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 "Rejtett másolat"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Levelező"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: 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 melléklet"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Nem támogatott séma"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Nem lehet ellenőrizni a levél aláírását"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Nem lehet ellenőrizni a levél aláírását"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Minden évben"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "Egy _nap"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Egy _hét"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Egy hón_ap"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13369,22 +13473,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nem sikerült feloldani a gépnevet: `%s': %s"
@@ -13427,33 +13531,33 @@ msgstr "Feladó hozzáadása a címjegyzékhez"
 msgid "Open in %s..."
 msgstr "Megnyitás ezzel: %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 ""
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Feliratkozás"
 
-#: 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 "Mappa"
 
 #. 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 "Válassz egy kiszolgálót."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Nincs kiszolgáló kiválasztva."
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Ne jelenjen meg többé ez az üzenet."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13462,27 +13566,27 @@ msgstr ""
 "Hiba a szűrőinformációk betöltése közben:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Szűrők"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Továbbított levél"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "ismeretlen feladó"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltezéssel %H:%M-kor %%s ezt írta:"
 
-#: 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"
@@ -13491,7 +13595,7 @@ msgstr ""
 "Nem sikerült menteni: `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13500,38 +13604,38 @@ msgstr ""
 "`%s' már létezik.\n"
 "Felülírod?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Üzenet"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Levél mentése másként..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "Cím"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "A feladó %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13544,7 +13648,7 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a leveleket?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13622,275 +13726,309 @@ msgstr "A levél alapértelmezett tárgya"
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "A levél alapértelmezett tárgya"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "_Válasz stílusa:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Megjelenjen-e a mappasáv"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Megjelenjen-e a mappasáv"
 
-#: 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 "Megjelenjen-e a mappasáv"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Kuka ürítése kilépéskor"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Postafiókok"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Művelet végrehajtása,"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Értesítés új levélről"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Értesítés új levélről"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "HTML levél küldése?"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "HTML levél küldése?"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "Animált képek megjelenítése"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Animált képek megjelenítése"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Levél megjelenítése a szokásos stílusban"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Betekintő ablaktábla"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminál betűkészlete:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Változó szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: 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;"
@@ -13898,113 +14036,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Téma szerinti levéllista"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Téma szerinti levéllista"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Importálás"
@@ -14044,14 +14182,14 @@ msgstr "Az Evolution importálja a régi Elm-leveleket."
 #: 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 "Importálás folyamatban..."
 
 #: 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 "Várj"
 
@@ -14100,12 +14238,12 @@ msgstr "Fájlok importálása"
 msgid "Scanning %s"
 msgstr "%s pásztázása"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritásszűrő \"%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"
@@ -14131,7 +14269,7 @@ msgstr ""
 "Ellenőrizd az importált szűrőket, hogy minden úgy működik-e,\n"
 "ahogy szeretnéd."
 
-#: 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"
@@ -14144,7 +14282,7 @@ msgstr ""
 "támogat az Evolution.\n"
 "Ezek a szűrők elvetésre kerülnek."
 
-#: 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"
@@ -14158,24 +14296,24 @@ msgstr ""
 "ellenőrzik, hogy az adott karakterláncot tartalmazzák-e a \n"
 "levelek vagy sem."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Beállítások"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Levélszűrők"
 
-#: 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?"
@@ -14208,62 +14346,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Jelenlegi tárolási formátum:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Szövegtörzs indexelése"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Új tárolási formátum"
-
-#: 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 ""
-"Megjegyzés: Amikor postafiók-formátumok között végzel \n"
-"átalakításokat, a sikertelen művelet (pl. betelt a lemez)\n"
-"nem feltétlenül vonható vissza. Légy óvatos."
-
-#: 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 "Nem adtad meg az összes szükséges információt."
 
 #. 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 Postafiók-szerkesztő"
 
-#: 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 "_Gép:"
 
-#: 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 "_Felhasználónév:"
 
-#: 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 "Ú_tvonal:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz létre két egyező nevű postafiókot."
 
@@ -14296,11 +14400,11 @@ msgstr "Válasz"
 msgid "Add Filter Rule"
 msgstr "Szűrőszabály hozzáadása"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "A következő szűrési szabály(ok):\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14311,47 +14415,47 @@ msgstr ""
 "eltávolított mappa használatban van\n"
 "és frissítve lett."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Vannak el nem küldött levelek. Biztosan kilépsz?"
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Új levél"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Levél"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Új levél írása"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Új VMappa"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Levélszűrők"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Az URI, amit a naptár megjelenít"
 
-#: 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 "Azonosító"
 
-#: 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 "
@@ -14361,11 +14465,12 @@ msgstr ""
 "kell kitöltened, ha szeretnéd feltüntetni ezeket az adatokat a kimenő "
 "leveleidben."
 
-#: 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 "Levelek fogadása"
 
-#: 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."
@@ -14374,15 +14479,15 @@ msgstr ""
 "Ha nem vagy biztos az adatokban, kérdezd meg a rendszergazdát vagy az "
 "internetszolgáltatót."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Válassz az alábbi lehetőségek közül"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Levelek küldése"
 
-#: 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."
@@ -14391,11 +14496,11 @@ msgstr ""
 "nem tudod, hogy milyen protokollt kell használnod, kérdezd meg a "
 "rendszergazdát vagy az internetszolgáltatót."
 
-#: 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 "Postafiók-kezelés"
 
-#: 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 "
@@ -14408,125 +14513,257 @@ msgstr ""
 "alkotja az Evolution postafiókot. Add meg lent a postafiók nevét. Ez a név "
 "csak az Evolution programban jelenik meg."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Szolgáltatás ellenőrzése"
 
-#: 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 "Kapcsolódás a kiszolgálóhoz..."
 
-#: 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 "_Támogatott típusok lekérdezése"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Előnézet"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Állapot:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Állapot:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Postafiók-szerkesztő"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Postafiók adatai"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Új levelek keresése"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "_Parancsfájl hozzáadása"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Új aláírás hozzáadása..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Mindig küldjön rejtett másolatot (Bcc) ide:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Mindig küldjön másolatot (Cc) ide:"
+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 "Értesítés új levélről"
+
+#: 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 "Elküldött levelek és piszkozatok"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Postafiók-szerkesztő"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Új aláírás hozzáadása..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "_Parancsfájl hozzáadása"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Mindig küldjön másolatot (Cc) ide:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Mindig küldjön rejtett másolatot (Bcc) ide:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Titkosításkor mindig megbízom a kulcskarikámon található kulcsokban."
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Eredeti levél csatolása"
 
-#: 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 "Melléklet"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Hitelesítés"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Hangulatjelek képeinek automatikus beillesztése"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Az új _levelek automatikus lekérdezése"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Hangjelzés új levél beérkezésekor"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "_Karakterkészlet:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "S_zínek"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "_Támogatott típusok lekérdezése"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Helyesírás-ellenőrzés _beírás közben"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Új levelek keresése"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Ro_sszul írt szavak színe:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Levél írása"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "S_zínek"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Beállítások"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Megerősítés a mappa tisztításakor"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14542,140 +14779,116 @@ msgstr ""
 "\n"
 "Kattints az \"Alkalmaz\" gombra a beállítások mentéséhez."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Alapértelmezett"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Alapértelmezett viselkedés"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "_Alapértelmezett karakterkódolás: "
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Levél törlése"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
+msgid "Defaults"
+msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Ne idézze az eredeti levelet"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitás esetén)"
 
-#: 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 "Kész"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Postafiókok"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "E-mail _cím:"
 
-#: 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 "_Kuka ürítése kilépéskor"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafiók varázsló"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Parancs végrehajtása..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "_Fix szélességű:"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Szűrők"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Betűk beállításai"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Üzenetek _HTML formázása"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML-levél"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "Élőfej"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "_Idézetek kiemelése"
 
-#: 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 "Beágyazott"
 
-#: 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 "Címkék és színek"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Képek betöltése"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Levelezés beállítása"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Postafiók helye"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Levélszerkesztő"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Levél megjelenítése"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Levél betűje"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Értesítés új levélről"
-
-#: 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"
@@ -14683,140 +14896,149 @@ msgstr ""
 "Megjegyzés: az első bejelentkezésig nem kapsz semmilyen figyelmeztetést a "
 "jelszó megadására."
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Egyéb információ"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "S_zervezet:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _kulcs azonosítója:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Szín kiválasztása"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
 
-#: 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 "Nyomtatásnál használt betűk"
-
-#: 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 "Eredeti levél idézése"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Idézet"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "_Jelszó megjegyzése"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Vá_laszcím:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Levelek fogadása"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "_Fogadás beállításai"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "_Jelszó megjegyzése"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Kötelező adatok"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Alapértékek"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Standard betűkészlet:"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
 msgstr "_Biztonság"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Biztonságos MIME (S/MIME)"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Fix szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Fix szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Változó szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Változó szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Törlés..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Levél küldése"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "El_küldött levelek mappája"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Elküldött levelek és piszkozatok"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolgáló megköveteli a _hitelesítést"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Kiszolgáló beállítása"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Kiszolgáló _típusa: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Aláírás:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Aláírás"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "_Fájlnév megadása:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Szabványos Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Terminál betűkészlete:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Típus:"
+
+#: 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"
@@ -14825,7 +15047,7 @@ msgstr ""
 "Ennek a parancsfájlnak a kimenete lesz az aláírásod.\n"
 "Az itt megadott név csak megjelenítés célját szolgálja."
 
-#: 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 "
@@ -14835,7 +15057,7 @@ msgstr ""
 "azok a nyelvek vannak felsorolva, amelyekhez van telepítve helyesírás-"
 "ellenőrző szótár."
 
-#: 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\""
@@ -14843,15 +15065,15 @@ msgstr ""
 "Írd be azt a nevet, amellyel hivatkozni szeretnél erre a postafiókra.\n"
 "Például: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14861,179 +15083,110 @@ msgstr ""
 "\n"
 "A folytatáshoz kattints a \"Következő\" gombra."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Aláírás hozzáadása"
 
-#: 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 "_Mindig töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Hitelesítési típus:"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Hitelesítési típus:"
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Az új _levelek automatikus lekérdezése"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Hangulatjelek képeinek automatikus beillesztése"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Hangjelzés új levél beérkezésekor"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Megerősítés a mappa tisztításakor"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Alapértelmezett aláírás:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Alapértékek"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne értesítsen, ha új levél érkezik"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Továbbítás stílusa:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Teljes név:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML-levél"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Személyazonosság"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "június"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Képek betöltése, ha a feladó szerepel a címjegyzékben"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Várakozás a levél olvasottként megjelölése előtt:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Név:"
 
-#: 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 "_Soha ne töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
-
-#: 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 "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Kérdez, ha ü_res tárggyal akarod elküldeni a levelet"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Levelek fogadása"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Válasz stílusa:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Alapértékek"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Parancsfájl:"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Törlés..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Levél küldése"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Animált képek megjelenítése"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Aláírás"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Standard betűkészlet:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminál betűkészlete:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_A többi alkalmazás által használt betűkészlet használata"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "perc"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "szín"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "leírás"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingelése"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15042,7 +15195,7 @@ msgstr ""
 "Hiba `%s' közben:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15051,7 +15204,7 @@ msgstr ""
 "Hiba a művelet végrehajtása közben:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Várj"
 
@@ -15059,16 +15212,16 @@ msgstr "Várj"
 msgid "Filtering Folder"
 msgstr "Mappa szűrése"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nem sikerült alkalmazni a kimenő szűrőket: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15077,116 +15230,115 @@ msgstr ""
 "Nem sikerült hozzáírni a következőhöz: %s: %s\n"
 "A helyi `Elküldött elemek' mappához lesz hozzáírva."
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nem sikerült hozzáírni a helyi `Elküldött elemek' mappához: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "'%s' küldése"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d üzenet küldése"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Hiba a %d / %d üzenetnél"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "A levél dekódolása sikertelen."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Kész."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Levél mentése a mappába"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása \"%s\"-ben"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Továbbított levelek"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "%s tároló megnyitása"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Mappa frissítése"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Mappa tisztítása"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Kuka ürítése: '%s'"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Helyi mappák"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levél letöltése"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "%d levél letöltése"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d levél letöltése"
+msgstr[1] "%d levél letöltése"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "%d levél mentése"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "%d levél mentése"
+msgstr[1] "%d levél mentése"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15195,7 +15347,7 @@ msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15204,11 +15356,11 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Melléklet mentése"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15217,25 +15369,21 @@ msgstr ""
 "Nem lehet létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Szétkapcsolódás %s kiszolgálóval"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Újrakapcsolódás %s kiszolgálóhoz"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Kis- és nagybetűk megkülönböztetése"
@@ -15248,88 +15396,81 @@ msgstr "Keresés a levélben"
 msgid "Find:"
 msgstr "Keresés:"
 
-#: mail/mail-search.glade.h:5
-#, fuzzy
-msgid "Search"
-msgstr "_Keresés"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Aláírás szerkesztése"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Kivételek"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Postafiók adatai"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Megszakítás..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Kiszolgáló: %s,  Típus: %s "
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Útvonal: %s, Típus: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Levelek küldése és fogadása"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "_Mindent megszakít"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Frissítés..."
 
-#: 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 "Várakozás..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "A felhasználó megszakította a műveletet."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Írd be a jelszót"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nem sikerült menteni az aláírásfájlt: %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"
@@ -15339,23 +15480,23 @@ msgstr ""
 "\n"
 "Akarod menteni a változásaidat?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "_Változások elvetése"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Aláírás mentése"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Aláírás szerkesztése"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Írj be egy nevet ehhez az aláíráshoz."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Név:"
 
@@ -15385,17 +15526,17 @@ msgstr "Továbbított levél"
 msgid "Invalid folder: `%s'"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vMappa beállítása: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "vMappák frissítése erre az uri-ra: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15408,84 +15549,84 @@ msgstr ""
 "    '%s'\n"
 "és frissítve lettek."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vMappák"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "VMappa szerkesztése"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "A nem létező '%s' vmappát próbálod szerkeszteni."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Új VMappa"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Nem nézett"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Nézett"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Megválaszolt"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Több láthatatlan levél"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Több levél"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: 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 "Ma %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %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 "%Y %b %d"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Levéllista létrehozása"
 
@@ -15533,7 +15674,7 @@ msgstr "Nyomon követés"
 msgid "For Your Information"
 msgstr "Tudd meg, hogy..."
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Továbbítás"
 
@@ -15541,11 +15682,11 @@ msgstr "Továbbítás"
 msgid "No Response Necessary"
 msgstr "Nem szükséges válaszolni"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Válasz"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Válasz mindenkinek"
 
@@ -15570,7 +15711,8 @@ msgstr ""
 "Kérlek válassz egy nyomon követési tevékenységet a \"Jelölő\" menüből."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Esedékes:"
 
 #: mail/message-tags.glade.h:7
@@ -15793,7 +15935,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Az ehhez az elemhez kapcsolódó értekezlet lemondása"
 
-#: 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 "Válaszd ki az információt, amelyet importálni szeretnél:"
 
@@ -15822,26 +15964,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Válassz importálót"
 
-#: 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 "`%s' fájl nem létezik."
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importálás folyamatban"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importálás folyamatban"
 
-#: 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 "Hiba %s betöltésekor"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15850,35 +15992,35 @@ msgstr ""
 "%s importálása\n"
 "1. elem importálása."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Fájlnév:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Válassz egy fájlt"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Fájltípus:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Adatok és beállítások importálása korábbi programokból"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Egyetlen fájl importálása"
 
-#: 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"
@@ -15886,26 +16028,26 @@ msgstr ""
 "Várj...\n"
 "Meglévő beállítások keresése"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Az okos importálók indítása"
 
-#: 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 "Feladó %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "'%s' protokollhoz nincs támogatás"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "A gpg végrehajtása sikertelen."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Importálás"
@@ -15914,7 +16056,7 @@ msgstr "Importálás"
 msgid "Closing connections..."
 msgstr "Kapcsolatok bezárása..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Az Evolution beállításai"
 
@@ -15948,11 +16090,11 @@ msgstr "Nem sikerült megnyitni a megosztott mappát: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "A megadott megosztott mappa nem található."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Importálás kezdete"
 
-#: 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 "
@@ -15961,11 +16103,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Asszisztens"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nincs mappanév megadva"
@@ -16007,15 +16144,15 @@ msgstr "Nem sikerült futtatni a Bug buddy-t."
 msgid "About Ximian Evolution"
 msgstr "A Ximian Evolution névjegye"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Munka a hálózatban"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
@@ -16067,7 +16204,6 @@ msgstr "Jelölőnégyzet"
 
 #: 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 "Új"
 
@@ -16124,16 +16260,17 @@ msgid "Create a new test item"
 msgstr "Új feladat létrehozása"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Aktív kapcsolatok"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Kattints az OK gombra a kapcsolat bezárásához"
+msgid "Active Connections"
+msgstr "Aktív kapcsolatok"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Kattints az OK gombra a kapcsolat bezárásához"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16255,28 +16392,28 @@ msgstr ""
 "Ez a varázsló végigvezet a külső fájlok Evolutionbe \n"
 "importálásának folyamatán."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importálók"
 
-#: 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álás"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ne importálja"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ne kérdezze meg többet."
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Az Evolution a következő fájlokból képes adatokat importálni:"
 
 #. 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"
@@ -16311,7 +16448,7 @@ msgstr ""
 "Reméljük, élvezni fogod a kemény munkánk eredményét, és várjuk\n"
 "hozzájárulásod! \n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16319,48 +16456,48 @@ msgstr ""
 "Köszönettel\n"
 "A Ximian Evolution Csapat\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ne jelenítse meg többet"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "A Ximian Evolution héj nem elérhető."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nem sikerült inicializálni a Ximian Evolution héjat: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: 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"
@@ -16370,50 +16507,61 @@ msgstr ""
 "egyszerre\n"
 "--Haználd a(z)%s --help parancsot további információk eléréséhez\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
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Válassz importálót"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Folyamatjelző"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Kifejezés"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-mail cím összefésülése"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "A tanúsítvány lejárt: %s\n"
 "Kibocsátó: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Írd be %s jelszavát"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Írd be %s jelszavát"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Írd be a jelszót"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16619,7 +16767,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "A kártyaazonosító már létezik"
@@ -16922,7 +17071,7 @@ msgstr "Névjegyek áthelyezése másik mappába..."
 msgid "Move to Folder..."
 msgstr "Áthelyezés mappába..."
 
-#: 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 "A vágólap tartalmának beillesztése"
 
@@ -16931,8 +17080,8 @@ msgid "Previews the contacts to be printed"
 msgstr "A nyomtatandó névjegyek nyomtatási képe"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Nyomtatási _kép"
 
@@ -16981,13 +17130,13 @@ msgstr "Betöltés leállítása"
 msgid "View the current contact"
 msgstr "Az aktuális névjegy megtekintése"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Műveletek"
 
@@ -17008,14 +17157,10 @@ msgid "_Save as VCard"
 msgstr "_Mentés VCard-ként"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Névjegyek keresése"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Mindet kijelöli"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Levél _küldése ennek a személynek..."
 
@@ -17023,58 +17168,54 @@ msgstr "Levél _küldése ennek a személynek..."
 msgid "Day"
 msgstr "Nap"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Az összes előfordulás törlése"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "A találkozó törlése"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Az előfordulás törlése"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Az előfordulás törlése"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ugrás"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Vissza"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Előre"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "_Dátumra ugrás"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Ugrás adott dátumra"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Ugrás a mai napra"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Hónap"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Következő"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "A nyomtatandó naptár nyomtatási képe"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Előző"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Naptár nyomtatása"
@@ -17083,7 +17224,7 @@ msgstr "Naptár nyomtatása"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Szabad/foglalt információ közzététele ehhez a naptárhoz"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
@@ -17095,35 +17236,55 @@ msgstr "Találkozókat és eseményeket tartalmazó nyilvános mappa"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Válassz neveket"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Ugrás adott dátumra"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Válassz mappát"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Részletek"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Egy nap megjelenítése"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Egy hónap megjelenítése"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Egy hét megjelenítése"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "A munkahét megjelenítése"
 
-#: 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 "Ma"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Az aktuális névjegy megtekintése"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Hét"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Találkozó"
@@ -17393,7 +17554,7 @@ msgstr "Min_degyik elolvasva"
 msgid "Mark all visible messages as read"
 msgstr "Az összes látható leveleket elolvasottnak jelöli meg"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Üzenet(ek) beillesztése a vágólapról"
 
@@ -17566,311 +17727,313 @@ msgid "F_orward As..."
 msgstr "_Továbbítás"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Szűrő szabályok"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Szűrő a _levelezőlistára..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "S_zűrő a feladóra..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Szűrő a _címzettekre..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Szűrő a _tárgyra..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "A kijelölt üzenetek megjelölése nem fontosként"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "A kiválasztott üzenete(ke)t nyomon követésre jelöli meg."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_Nyomon követés..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Képek betöltésének kényszerítése HTML levelekben"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "A kijelölt levél továbbítása az új levél törzsében"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "A levél továbbítása idézetként, ahogy a válaszban szokás"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "A kijelölt levél továbbítása valakinek"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "A kijelölt levél továbbítása valakinek mellékletként"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Szöveg betűméretének növelése"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "_Képek betöltése"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "_Fontos"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "_Olvasatlan"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "_Nem fontos"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "A kijelölt üzenetek megjelölése olvasottként"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "A kijelölt üzenetek megjelölése fontosként"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "A kijelölt üzenetek megjelölése nem fontosként"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "A kijelölt üzenet(ek) megjelölése olvasatlanként"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "A kijelölt üzenet(ek) megjelölése olvasatlanként"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "A kijelölt üzenetek megjelölése nem fontosként"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "A kijelölt leveleket törlésre jelöli ki"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Áthelyezés"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "A kijelölt üzenet(ek) áthelyezése egy másik mappába"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Következő"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Következő _fontos levél"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Következő _szál"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "_Következő olvasatlan levél"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Nem található"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Az kijelölt levél megnyitása új ablakban"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "A kijelölt levél megnyitása a szerkesztőben újraküldés céljából"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Eredeti _méret"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "_Előző olvasatlan levél"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Válasz küldése"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Válasz küldése egy nyilvános mappában lévő levélre"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "_Előző fontos levél"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Előnézeti képet ad a nyomtatandó levélről"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Előző"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Levél nyomtatása"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Át_irányítás"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "A kijelölt levél átirányítás valakinek"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Helyreállítja a szöveg eredeti betűméretét"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "_Keresés a levélben..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "K_isebb"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Levél mentése szövegfájlként"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Oldalbeállítás az aktuális nyomtatóhoz"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Levél forrásának megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Teljes _fejléc megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Levél megjelenítése a szokásos stílusban"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Levél megjelenítése a teljes fejléccel"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Levél nyers forrásának megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "S_zöveg betűmérete"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "A kijelölt levelek törlésének visszavonása"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VMappa a _levelezőlistára..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VMappa a _feladóra..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VMappa a _címzettekre..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VMappa a _tárgyra..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Mellékletként"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Másolás mappába"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Szűrő _gyártása levélből"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Ugrás"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Beágyazva"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "N_agyobb"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "Levél _megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Á_thelyezés mappába"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Következő levél"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Szokásos megjelenítés"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "Levél _megnyitása"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Előző levél"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Idézetként"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "_Újraküldés..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Eszközök"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Visszaállítás"
 
@@ -18140,40 +18303,40 @@ msgstr "Kijelölt feladat másolása"
 msgid "Cut selected task"
 msgstr "Kijelölt feladat kivágása"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Befejezett feladatok törlése"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Kijelölt feladatok törlése"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Megjelölés készként"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Kijelölt feladatok megjelölése készként"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Feladat beillesztése a vágólapról"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "A nyomtatandó feladatlista nyomtatási képe"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Feladatlista nyomtatása"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Kijelölt feladatok törlése"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "Új feladat"
@@ -18307,10 +18470,15 @@ msgid "_Day View"
 msgstr "_Napnézet"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Egyéni nézet"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Hónapnézet"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Munkahétnézet"
 
@@ -18345,10 +18513,16 @@ msgid "_Messages"
 msgstr "Üzenetek"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "_Kategóriákkal"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Le_járat:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Állapot beállítása"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Feladatok"
 
@@ -18407,14 +18581,10 @@ msgstr "HKSCPSV"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: 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 "Most"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Ma"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18424,82 +18594,87 @@ msgstr "A időt a következő formában kell beírni: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A százalékos értéknek 0 és 100 között kell lennie"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Balti"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Közép-európai"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Kínai"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cirill"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Görög"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Héber"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japán"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Koreai"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Török"
 
-#: 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 "Nyugat-európai"
 
-#: 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 "Nyugat-európai"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Hagyományos"
 
-#: 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 "Egyszerűsített"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrán"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Vizuális"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ismeretlen karakterkészlet: %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 "Karakterkódolás"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Írd be a használandó karakterkészlet: "
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Egyéb..."
 
@@ -18566,11 +18741,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Keresés"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Keresésszerkesztő"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Keresés mentése"
 
@@ -18591,15 +18771,15 @@ msgstr "_Haladó..."
 msgid "Choose Image"
 msgstr "Fájl kiválasztása"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Keresés"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Keresés most"
 
-#: 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 "_Törlés"
 
@@ -18630,6 +18810,339 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kész)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Címjegyzék forrásai..."
+
+#~ msgid "Selected:"
+#~ msgstr "Kiválasztva:"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Névjegy"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "és %d egyéb kártya"
+
+#~ msgid "Send an Email"
+#~ msgstr "Levél küldése"
+
+#~ msgid "1 day"
+#~ msgstr "1 nappal"
+
+#~ msgid "1 week"
+#~ msgstr "1 hét"
+
+#~ msgid "1 hour"
+#~ msgstr "1 órával"
+
+#~ msgid "1 minute"
+#~ msgstr "1 perccel"
+
+#~ msgid "1 second"
+#~ msgstr "1 másodperc"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Leírás:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Találkozó"
+
+#~ msgid "Alarms"
+#~ msgstr "Ébresztők"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Földrajzi hely"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "%d naponta"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "%d hetente"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "%d hetente ekkor"
+
+#~ msgid "every %d months"
+#~ msgstr "%d havonta"
+
+#~ msgid "Every %d years"
+#~ msgstr "%d évente"
+
+#~ msgid "Go To Date"
+#~ msgstr "Dátumra ugrás"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Ugrás mára"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Kiszolgáló neve"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "Keresés _kiindulópontja:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "Időtúllépés a STARTTLS kérésnél: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "Hibás STARTTLS válasz"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "Időtúllépés az HELO kérésnél: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "Hibás HELO válasz"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "Időtúllépés az AUTH kérésnél: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH kérés sikertelen."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Hibás MAIL FROM válasz"
+
+#~ msgid "DATA response error"
+#~ msgstr "Hibás DATA válasz"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "Időtúllépés a DATA küldésénél: a levél véget ért: %s: a levél nem ment el"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA lezárás válasz hiba"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "Időtúllépés az RSET kérésnél: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "Hibás RSET válasz"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "Időtúllépés az QUIT kérésnél: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "Hibás QUIT válasz"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d másodperce"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d perce"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d órája"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d napja"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d hete"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d hónapja"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d éve"
+
+#~ msgid "Then"
+#~ msgstr "Akkor"
+
+#~ msgid "If"
+#~ msgstr "Keresési feltételek"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Szűrők szerkesztése"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "VMappák szerkesztése"
+
+#~ msgid "Outgoing"
+#~ msgstr "Kimenő"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Üzenet bevezetése egy héjparancsba"
+
+#~ msgid "Shell Command"
+#~ msgstr "Héjparancs"
+
+#~ msgid "Rules"
+#~ msgstr "Szabályok"
+
+#~ msgid "[script]"
+#~ msgstr "[parancsfájl]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Parancsfájl-aláírás hozzáadása"
+
+#~ msgid "Current store format:"
+#~ msgstr "Jelenlegi tárolási formátum:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Szövegtörzs indexelése"
+
+#~ msgid "New store format:"
+#~ msgstr "Új tárolási formátum"
+
+#~ 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 ""
+#~ "Megjegyzés: Amikor postafiók-formátumok között végzel \n"
+#~ "átalakításokat, a sikertelen művelet (pl. betelt a lemez)\n"
+#~ "nem feltétlenül vonható vissza. Légy óvatos."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
+
+#~ msgid "Account Information"
+#~ msgstr "Postafiók adatai"
+
+#~ msgid "Authentication"
+#~ msgstr "Hitelesítés"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Levél írása"
+
+#~ msgid "Configuration"
+#~ msgstr "Beállítások"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Alapértelmezett viselkedés"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Levél törlése"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "Szűrők"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Címkék és színek"
+
+#~ msgid "Loading Images"
+#~ msgstr "Képek betöltése"
+
+#~ msgid "Message Display"
+#~ msgstr "Levél megjelenítése"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Levél betűje"
+
+#~ msgid "Optional Information"
+#~ msgstr "Egyéb információ"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Nyomtatásnál használt betűk"
+
+#~ msgid "Re_member this password"
+#~ msgstr "_Jelszó megjegyzése"
+
+#~ msgid "Remember this _password"
+#~ msgstr "_Jelszó megjegyzése"
+
+#~ msgid "Required Information"
+#~ msgstr "Kötelező adatok"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Alapértékek"
+
+#~ msgid "S_ecurity"
+#~ msgstr "_Biztonság"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Biztonságos MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Kiszolgáló beállítása"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Hitelesítési típus:"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Hitelesítési típus:"
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Alapértelmezett aláírás:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Teljes név:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Személyazonosság"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "június"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Levelek fogadása"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Alapértékek"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Levél küldése"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "'%s' küldése"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Hiba a %d / %d üzenetnél"
+
+#, fuzzy
+#~ msgid "Search"
+#~ msgstr "_Keresés"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Aláírás szerkesztése"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Kivételek"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Asszisztens"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Névjegyek keresése"
+
+#~ msgid "Go to _Date"
+#~ msgstr "_Dátumra ugrás"
+
+#~ msgid "Go to today"
+#~ msgstr "Ugrás a mai napra"
+
+#~ msgid "With _Category"
+#~ msgstr "_Kategóriákkal"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Címjegyzék forrásai"
 
@@ -18670,10 +19183,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Scanning directory"
 #~ msgstr "Mappa pásztázása"
 
-#, fuzzy
-#~ msgid "    "
-#~ msgstr "      "
-
 #~ msgid "Cannot copy folder: %s"
 #~ msgstr "Nem sikerült a mappa másolása: %s"
 
@@ -19146,9 +19655,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Find contact in"
 #~ msgstr "Névjegy keresése"
 
-#~ msgid "Select Names"
-#~ msgstr "Válassz neveket"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Kijelölt névjegyek:"
 
@@ -19174,9 +19680,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "No cards"
 #~ msgstr "0 kártya"
 
-#~ msgid "1 card"
-#~ msgstr "1 kártya"
-
 #~ msgid "%d cards"
 #~ msgstr "%d kártya"
 
@@ -19257,9 +19760,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "_Save as..."
 #~ msgstr "_Mentés másként..."
 
-#~ msgid "End Date"
-#~ msgstr "Határidő"
-
 #~ msgid "New _Appointment"
 #~ msgstr "Új _találkozó"
 
@@ -19420,9 +19920,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Failed to find a common bulk algorithm."
 #~ msgstr "Nem sikerült \"common bulk\" algoritmust találni."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "A levél dekódolása sikertelen."
-
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Nem sikerült létrehozni a PGP aláírás részt"
 
@@ -19697,9 +20194,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "You cannot change the format of a non-local folder."
 #~ msgstr "Nem változtathatod meg nem helyi mappák formátumát."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Névtelen levél)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Üres levél"
 
@@ -19730,9 +20224,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Itt állítható be az Evolution Összefoglaló"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolution Összefoglaló"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolution Összefoglaló komponens"
 
@@ -27950,12 +28441,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "News Feeds"
 #~ msgstr "Hírforrások"
 
-#~ msgid "One mont_h"
-#~ msgstr "Egy hón_ap"
-
-#~ msgid "One w_eek"
-#~ msgstr "Egy _hét"
-
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "_Frissítési idő (másodperc):"
 
@@ -27974,9 +28459,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "A hőmérséklet mértékegysége:"
 
-#~ msgid "Tasks "
-#~ msgstr "Feladatok "
-
 #~ msgid "Weather Settings"
 #~ msgstr "Időjárás beállításai"
 
@@ -27995,9 +28477,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "_New Feed"
 #~ msgstr "Új _hírforrás"
 
-#~ msgid "_One day"
-#~ msgstr "Egy _nap"
-
 #~ msgid "_Show full path for folders"
 #~ msgstr "Mappák _teljes elérési útjának megjelenítése"
 
diff --git a/po/it.po b/po/it.po
index 454f026944..f5548ef00f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-01-28 15:06+0100\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,6 +19,47 @@ msgstr ""
 "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 "Rubrica di Evolution"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Elenco cartelle rubriche locali"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Salva con nome"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "card"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "card"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Contatti: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Allarme di Evolution"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Indirizzo sync predefinito:"
@@ -97,76 +138,92 @@ msgstr "Gestione dei certificati S/Mime"
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "L'agenda '%s' sarà rimossa. Sei sicuro di voler continuare?"
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: 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 "Elimina"
 
-#: 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 "Proprietà..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Nuova elenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "E_lenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Crea un nuovo elenco contatti"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Nuova rubrica"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Rubrica"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Crea una nuova attività"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Connessione al server LDAP non riuscita"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "L'autenticazione con il server LDAP non riuscita"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Impossibile eseguire interrogazione su DSE Root"
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr "Il server ha risposto con basi di ricerca non supportate"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Questo server non supporta le informazioni di schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Errore nel caricare le informazioni di schema"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Il server non risponde con informazioni di schema valide"
 
@@ -195,17 +252,17 @@ msgstr "Migrazione di `%s':"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Su questo computer"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personale"
 
@@ -262,7 +319,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr "Questa interrogazione non è stata completata con successo."
 
-#: 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."
@@ -270,7 +327,7 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che il percorso esista e che "
 "si abbia il permesso di accedervi."
 
-#: 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."
@@ -278,7 +335,7 @@ msgstr ""
 "Impossibile aprire questa rubrica.  Questo significa che è stata inserita "
 "una URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: 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 "
@@ -288,7 +345,7 @@ msgstr ""
 "LDAP con Evolution è necessario compilare il programma dai sorgenti CVS dopo "
 "aver scaricato Open LDAP dal collegamento sottostante."
 
-#: 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."
@@ -296,28 +353,28 @@ msgstr ""
 "Impossibile aprire questa rubrica. Questo significa che è stata inserita una "
 "URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubrica"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accesso anonimo al server LDAP"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Autenticazione non riuscita.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sInserire la password per %s (utente %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 della sorgente contatti che la vista mostrerà"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "La URI che il calendario visualizzerà"
@@ -344,16 +401,10 @@ msgstr ""
 "URI per la cartella usata più recentemente nella finestra di selezione nomi"
 
 #: 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 "  Mostra basi supportate"
 
-#: 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
@@ -368,62 +419,53 @@ msgstr "  Mostra basi supportate"
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Assistente alla creazione della rubrica"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Proprietà della rubrica"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Sorgenti della rubrica..."
-
-#: 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 "Sempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -436,51 +478,51 @@ msgstr ""
 "Premere il tasto \"Fine\" per salvare le impostazioni \n"
 "inserite sino a questo punto."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "_Nome distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Indirizzo Email:"
 
-#: 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 utilizzerà questo DN per autenticarsi con il 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 utilizzerà questo indirizzo Email per autenticarsi con il 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 "Finito"
 
-#: 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 "Generale"
 
-#: 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 "Gruppo:"
 
-#: 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 "Mai"
 
-#: 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"
@@ -495,23 +537,19 @@ msgstr ""
 "connessione. \n"
 "Chiedere all'amministratore se il server LDAP usa questi protocolli."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Campo della ricerca: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Ricerca in corso"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Selezionato:"
-
-#: 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"
@@ -521,7 +559,7 @@ msgstr ""
 "LDAP solo se\n"
 "il server LDAP supporta SSL o 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"
@@ -539,7 +577,7 @@ msgstr ""
 "connessione è già\n"
 "sicura."
 
-#: 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"
@@ -553,7 +591,7 @@ msgstr ""
 "vulnerabili\n"
 "ad attacchi alla sicurezza del sistema."
 
-#: 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 "
@@ -564,7 +602,7 @@ msgstr ""
 "Evolution per\n"
 "le ricerche e per la creazione e modifica dei contatti."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -574,32 +612,32 @@ msgstr ""
 "Specificare un nome da mostrare ed un gruppo è l'ultimo passo necessario per "
 "la configurazione di una rubrica."
 
-#: 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 "Passo 1: caratteristiche della cartella"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "Passo 2: informazioni sul server"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "Passo 3: connessione al server"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "Passo 4: ricerca della 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 "Basi di ricerca supportate"
 
-#: 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"
@@ -611,7 +649,7 @@ msgstr ""
 "nelle ricerche e la durata di una ricerca. Per cambiarle rivolgersi \n"
 "all'amministratore di sistema."
 
-#: 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"
@@ -623,7 +661,7 @@ msgstr ""
 "Lasciando in bianco questo campo, la ricerca comincerà alla radice "
 "dell'albero delle directory."
 
-#: 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"
@@ -639,7 +677,7 @@ msgstr ""
 "Un'ampiezza di ricerca di \"uno\" includerà solo le voci un livello sotto la "
 "base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -656,7 +694,7 @@ msgstr ""
 "l'amministratore di sistema se serve aiuto per cercare questo tipo\n"
 "di informazioni."
 
-#: 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"
 "\"."
@@ -664,7 +702,7 @@ msgstr ""
 "Questo è il nome completo del server ldap. Per esempio \"ldap.miazienda.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -674,7 +712,7 @@ msgstr ""
 "Questo è il numero massimo di voci da scaricare. L'impostazione di un \n"
 "valore troppo grande rallenterà la rubrica."
 
-#: 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 "
@@ -684,7 +722,7 @@ msgstr ""
 "impostare questo come \"indirizzo Email\" richiede accesso anonimo al server "
 "ldap."
 
-#: 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"
@@ -694,7 +732,7 @@ msgstr ""
 "Evolution.\n"
 "Serve solo allo scopo di visualizzarlo."
 
-#: 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 "
@@ -703,7 +741,7 @@ msgstr ""
 "Questo è il nome che apparirà nell'elenco delle cartelle di Evolution.\n"
 "Serve solo allo scopo di visualizzarlo."
 
-#: 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"
@@ -716,28 +754,28 @@ msgstr ""
 "di \n"
 "sistema quale porta si dovrà specificare."
 
-#: 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 "Quest'opzione determina la durata di una ricerca."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "U_sa SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Uso nome distintivo (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Uso indirizzo Email"
 
-#: 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 "Quando è possibile"
 
-#: 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"
@@ -749,60 +787,48 @@ msgstr ""
 "Chiedere all'amministrazione di sistema se non si è sicuri di queste "
 "informazioni."
 
-#: 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 "_Mostra il nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "Limite di _download:"
 
-#: 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 "_Modifica"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "Metodo di identificazione:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Porta numero:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Base della ricerca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "Nome del _server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "scheda-connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "scheda-generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "scheda-ricerca"
 
@@ -834,7 +860,7 @@ msgid "Send HTML Mail?"
 msgstr "Invio posta in HTML?"
 
 #: 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 "Aggiungi ai contatti"
 
@@ -850,7 +876,7 @@ msgstr "Nome"
 
 #: 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 "Sorgente"
 
@@ -917,7 +943,8 @@ msgstr "Collaborazione"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Editor dei contatti"
 
@@ -926,7 +953,7 @@ msgid "D_epartment:"
 msgstr "_Dipartimento:"
 
 #: 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 "Dettagli"
@@ -1011,16 +1038,27 @@ msgstr "Ca_tegorie..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Elimina"
 
+#: 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 "_Modifica"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "Casa:"
@@ -1062,22 +1100,22 @@ msgid "_Web page address:"
 msgstr "Indirizzo pagina _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Indirizzo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Modificabile"
 
@@ -2059,9 +2097,9 @@ msgid "Novell Groupwise"
 msgstr "GroupWise Novell"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2074,20 +2112,21 @@ msgid "MSN Messenger"
 msgstr "Messenger MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Servizio"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Posizione"
 
@@ -2096,112 +2135,96 @@ msgid "Username"
 msgstr "Nome utente"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Casa"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Lavoro"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Libro sorgente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Libro oggetto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Contatto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Campi scrivibili"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Cambiato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Nome account"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Editor delle categorie non disponibile."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Salva contatto come vcard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Cancellare\n"
-"questi contatti?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Cancellare\n"
-"questo contatto?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Ufficio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "GroupWise Novell"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un campo: `%s'"
@@ -2215,6 +2238,7 @@ msgid "_Edit Full"
 msgstr "Modifica interamente"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Nome e cognome:"
 
@@ -2222,6 +2246,22 @@ msgstr "_Nome e cognome:"
 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 ""
+"Cancellare\n"
+"questi contatti?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Cancellare\n"
+"questo contatto?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Indirizzo _2:"
@@ -2324,22 +2364,28 @@ msgid "_Title:"
 msgstr "_Titolo:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "Nome account:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
 msgid "Add IM Account"
 msgstr "Aggiunto account IM"
 
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "Nome account:"
+
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+#, fuzzy
+msgid "_IM Service:"
 msgstr "Servizio IM:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Posizione:"
 
+#: 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 "Membri"
@@ -2361,25 +2407,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr "Editor dell'elenco dei contatti"
 
-#: 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 "Libro"
 
-#: 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 "È un nuovo elenco"
 
 #. 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 "Editor dell'elenco dei contatti"
 
-#: 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 "Salva elenco come vcard"
 
@@ -2431,23 +2478,21 @@ msgid "No contacts"
 msgstr "Nessun contatto"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 contatto"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d contatti"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contatti"
+msgstr[1] "%d contatti"
 
-#: 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 "Interrogazione"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Errore nell'ottenere la vista libro"
 
@@ -2459,132 +2504,131 @@ msgstr "Modello"
 msgid "Error modifying card"
 msgstr "Errore nella modifica della card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Il nome comincia per"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "L'Email comincia per"
 
-#: 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 "La categoria è"
 
 #. 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 "Qualunque campo contiene"
 
-#: 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 "Avanzato..."
 
-#: 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 "Tipo"
 
-#: 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 "Rubrica"
 
-#: 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 "Salva come vcard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Nuovo contatto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Nuovo elenco contatti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Vai alla cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Cerca contatti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Sorgenti della rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Impostazioni Pilot..."
 
-#: 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 "Contatto precedente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Invia un messaggio al contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Stampa busta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Rubrica..."
 
-#: 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 "Taglia"
 
-#. 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 "Copia"
 
-#: 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 "Incolla"
 
-#: 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 "Vista corrente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2597,7 +2641,7 @@ msgstr ""
 "Evolution"
 
 #. 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 "Qualunque categoria"
@@ -2631,8 +2675,6 @@ msgid "Car Phone"
 msgstr "Telefono auto"
 
 #: 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 "Categorie"
 
@@ -2641,7 +2683,7 @@ msgid "Company Phone"
 msgstr "Telefono ditta"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2692,6 +2734,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 "Cellulare"
 
@@ -2700,7 +2743,7 @@ msgid "Nickname"
 msgstr "Nickname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Note"
 
@@ -2709,7 +2752,7 @@ msgid "Office"
 msgstr "Ufficio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organizzazione"
 
@@ -2765,17 +2808,17 @@ msgid "Web Site"
 msgstr "Sito Internet"
 
 #: 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 "Larghezza"
 
 #: 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 "Altezza"
 
 #: 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 "Ha il focus"
 
@@ -2827,89 +2870,92 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adattatore"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Selezionato"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Ha il cursore"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Elenco membri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Lavoro"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Descrizione"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Gruppo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "URL della _video conferenza:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Telefono auto"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Personale"
+msgid "work"
+msgstr "Lavoro"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Personale"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Qualifica"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Pagina web"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Completato"
 
-#: 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
@@ -2917,93 +2963,93 @@ msgstr "Completato"
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Contatto non trovato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "ID del contatto esiste già"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
-#: 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 "Annullato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Autenticazione non riuscita"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Autenticazione richiesta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS non disponibile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "La rubrica non esiste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Annulla"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere l'elenco"
 
-#: 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 "Errore nell'aggiungere un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Errore nella modifica dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Errore nella modifica di un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Errore nella rimozione dell'elenco"
 
-#: 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 "Errore nella rimozione di una contatto"
 
-#: 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"
@@ -3012,7 +3058,7 @@ msgstr ""
 "L'apertura di %d contatti causerà l'apertura di %d nuove finestre.\n"
 " Visualizzare tutti i contatti indicati?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3021,50 +3067,50 @@ msgstr ""
 "%s esiste già\n"
 "Sovrascriverlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Errore nel salvare %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 "elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Sposta contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Copia contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Sposta contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Copia contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Seleziona contatti dalla rubrica"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "VCard multiple"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -3101,33 +3147,31 @@ msgstr "Aggiungi indirizzo al contatto esistente \"%s\""
 msgid "Querying Address Book..."
 msgstr "Interrogazione rubrica..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Modifica informazioni del contatto"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Unisci indirizzo Email"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "e %d altri contatti."
-
-#: 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 "e un'altro contatto."
+msgid_plural "and %d other contacts."
+msgstr[0] "e un'altro contatto."
+msgstr[1] "e un'altro contatto."
 
-#: 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 "Mostra VCard completa"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Vista vcard compatta"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
@@ -3278,7 +3322,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: 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 "Opzioni"
 
@@ -3461,7 +3505,7 @@ msgid "Unnamed List"
 msgstr "Elenco senza nome"
 
 #: 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 "Inserire la password"
 
@@ -3538,7 +3582,7 @@ msgid "Evolution's Tasks component"
 msgstr "Componente delle attività di Evolution"
 
 #: 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"
@@ -3584,26 +3628,26 @@ msgstr "Suoneria (minuti)"
 msgid "_Edit appointment"
 msgstr "_Modifica appuntamenti"
 
-#: 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 "Apri"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 #, fuzzy
 msgid "Dismiss"
 msgstr "_Abbandona"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 #, fuzzy
 msgid "Dismiss All"
 msgstr "Abbandona _tutto"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3616,12 +3660,12 @@ msgstr ""
 "Inizia da %s\n"
 "Finisce a %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 "Attenzione"
 
-#: 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"
@@ -3633,7 +3677,7 @@ msgstr ""
 "richiede l'invio di un messaggio Email.  Per questo,\n"
 "Evolution visualizzerà invece un messaggio a video."
 
-#: 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 "
@@ -3650,7 +3694,7 @@ msgstr ""
 "\n"
 "Si vuole davvero eseguire questo programma?"
 
-#: 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 "Non chiedere più su questo programma in futuro."
 
@@ -3817,13 +3861,13 @@ msgstr "Il commento contiene"
 msgid "Location contains"
 msgstr "La descrizione contiene"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: 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 "Calendario"
 
@@ -3842,7 +3886,7 @@ msgid "Purge events older than"
 msgstr "Elimina eventi più vecchi di"
 
 #: 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 "giorni"
 
@@ -3853,7 +3897,7 @@ 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.
 #: 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"
 
@@ -3875,70 +3919,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 "Il calendario '%s' sarà rimosso. Sei sicuro di voler continuare?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nuovo calendario"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "Riunion_e"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Crea una nuova richiesta di riunione"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Nuovo appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Nuovo calendario"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "C_alendario"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: 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 "Impossibile aprire il calendario '%s' per creare eventi e appuntamenti"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non c'è un calendario disponibile per creare eventi e appuntamenti"
 
@@ -3968,10 +4012,6 @@ msgstr "Vista settimanale"
 msgid "Month View"
 msgstr "Vista mensile"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Vista elenco"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Errore durante l'apertura del calendario"
@@ -3989,16 +4029,16 @@ msgstr "Negato il permesso di aprire il calendario"
 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 "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzerà"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Il tipo di vista da mostrare"
 
@@ -4062,11 +4102,11 @@ msgstr "dialogo1"
 msgid "extra times every"
 msgstr "tempo in più ogni"
 
-#: 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 "ore"
 
-#: 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 "minuti"
 
@@ -4089,11 +4129,11 @@ msgstr "Di base"
 msgid "Date/Time:"
 msgstr "Data/ora:"
 
-#: 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 "Visualizza un messaggio"
 
-#: 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 "Emetti un suono"
 
@@ -4101,17 +4141,17 @@ msgstr "Emetti un suono"
 msgid "Reminders"
 msgstr "Promemoria"
 
-#: 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 "Esegui programma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr "Invia una Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Invia un 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 "Indice:"
@@ -4142,7 +4182,7 @@ msgid "hour(s)"
 msgstr "ora(e)"
 
 #: 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 "minuto(i)"
 
@@ -4152,8 +4192,8 @@ msgstr "inizio dell'appuntamento"
 
 #. 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 "Abilitato"
 
@@ -4167,19 +4207,19 @@ msgstr "Non cancellare"
 
 #: 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 "Disabilita"
 
 #: 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 "Abilita"
 
@@ -4203,7 +4243,7 @@ msgstr "30 minuti"
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: 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 "Allarmi"
 
@@ -4228,7 +4268,7 @@ msgid "Days"
 msgstr "Giorni"
 
 #: 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 "_Abilita"
 
@@ -4323,7 +4363,7 @@ msgid "Wednesday"
 msgstr "Mercoledì"
 
 #: 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 "Settimana lavorativa"
 
@@ -4368,7 +4408,6 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Generale"
 
@@ -4468,7 +4507,7 @@ msgstr ""
 "inserite sino a questo punto."
 
 #: 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 "Nuovo elenco attività"
 
@@ -4630,28 +4669,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s non sono state effettuate modifiche. Aggiornare l'editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Errore di validazione: %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 " a"
 
-#: 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 " (Completato "
 
-#: 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 "Completato "
 
-#: 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 " (Scadenza "
 
-#: 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 "Scadenza "
 
@@ -4687,8 +4726,9 @@ msgstr "Voce nell'agenda - %s"
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: 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 "Salva come..."
 
@@ -4704,35 +4744,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Impossibile usare la versione corrente!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Impossibile aprire '%s': %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Destinatario"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Seleziona una sorgente di destinazione"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Calendario"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Nuovo elenco attività"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4761,19 +4786,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Cancellare questa voce dell'agenda senza nome?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Cancellare %d appuntamenti?"
+#, 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] "Cancellare %d appuntamenti?"
+msgstr[1] "Cancellare %d appuntamenti?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Cancellare %d attività?"
+#: 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] "Cancellare %d attività?"
+msgstr[1] "Cancellare %d attività?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Cancellare %d voci dell'agenda?"
+#: 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] "Cancellare %d voci dell'agenda?"
+msgstr[1] "Cancellare %d voci dell'agenda?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4841,7 +4872,7 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire delegato"
 
-#: 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 "Appuntamento"
 
@@ -4914,8 +4945,6 @@ msgstr "Calendario:"
 
 #: 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 "Classificazione"
 
@@ -4966,13 +4995,13 @@ msgstr "_Ora di inizio:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nessuno"
 
@@ -5029,13 +5058,13 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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
@@ -5208,7 +5237,7 @@ msgid "_No recurrence"
 msgstr "_Nessuna ricorrenza"
 
 #: 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 "_Rimuovere"
 
@@ -5250,7 +5279,7 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: 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 "Non salvare"
 
@@ -5258,6 +5287,28 @@ msgstr "Non salvare"
 msgid "Save Event"
 msgstr "Salva eventi"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Seleziona importatore"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Seleziona una sorgente di destinazione"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Calendario"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Nuovo elenco attività"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Le informazioni per la riunione sono state create. Inviarle?"
@@ -5291,39 +5342,39 @@ msgstr "% _Completato"
 #: 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 "Completato"
 
 #: 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 "Alta"
 
 #: 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 corso"
 
 #: 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 "Bassa"
 
 #: 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 "Normale"
 
 #: 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 "Da cominciare"
 
@@ -5337,7 +5388,8 @@ msgid "Undefined"
 msgstr "Non definita"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "Completato in _data:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5380,9 +5432,9 @@ msgstr "Impossibile aprire le attività in '%s'."
 msgid "Con_fidential"
 msgstr "Con_fidenziale"
 
-#: 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 "Descrizione:"
 
@@ -5391,11 +5443,13 @@ msgid "Folder:"
 msgstr "Cartella:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Data di _inizio:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "Sca_denza:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5447,136 +5501,113 @@ msgid "Weekly"
 msgstr "Settimanalmente"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d giorni"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 giorno"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d settimane"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 settimana"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d ore"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 ora"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minuti"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d giorni"
+msgstr[1] "%d giorni"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minuto"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d settimane"
+msgstr[1] "%d settimane"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d secondi"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ore"
+msgstr[1] "%d ore"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 secondo"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuti"
+msgstr[1] "%d minuti"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Invia un Email"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d secondi"
+msgstr[1] "%d secondi"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Azione sconosciuta"
 
-#: 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 prima dell'inizio dell'appuntamento"
 
-#: 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 dopo l'inizio dell'appuntamento"
 
-#: 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 all'inizio dell'appuntamento"
 
-#: 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 prima della fine dell'appuntamento"
 
-#: 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 dopo la fine dell'appuntamento"
 
-#: 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 alla fine dell'appuntamento"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s alle %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 per un'attivazione di tipo sconosciuto"
 
-#: 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 "Pubblico"
 
-#: 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 "Privato"
 
-#: 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 "Confidenziale"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Descrizione"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Data"
 
-#: 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 "Inizio"
 
-#: 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 "Sommario"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "colore"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "Componente"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Libero"
@@ -5612,141 +5643,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 "Sì"
 
-#: 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 "Sconosciuto"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Ricorrente"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Rimozione degli elementi selezionati in corso"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Aggiornamento elementi in corso"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Nuovo _appuntamento..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Nuovo _evento del giorno"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Nuova riunione"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Nuova attività"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "S_tampa..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Incolla"
-
-#: 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 "Vai a _oggi"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Vai alla data..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Pubblica le informazioni sulla disponibilità"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Apri"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "_Salva con nome..."
-
-#: 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 "_Taglia"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Copia"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "Pianifica una riunione..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "Inoltra come iCalendar..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "_Elimina questa ricorrenza"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Elimina _tutte le ricorrenze"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "Impostazioni..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5791,32 +5720,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 "Rimozione degli elementi selezionati in corso"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Aggiornamento elementi in corso"
+
+#: 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 "_Apri"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Apri pagina _web"
 
-#: 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 "_Salva con nome..."
+
+#: 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 "S_tampa..."
+
+#: 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 "_Taglia"
+
+#: 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 "_Copia"
+
+#: 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 "_Incolla"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Assegna attività"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "Inoltra come iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Segna come completato"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Segna attività come co_mpletata"
 
-#: 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 "_Elimina le attività selezionate"
 
-#: 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 "Fare clic qui per aggiungere un'attività"
 
@@ -5825,38 +5807,101 @@ msgstr "Fare clic qui per aggiungere un'attività"
 msgid "% Complete"
 msgstr "% Completato"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Avvisi sonori"
-
-#: 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 "Completato"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Ultimato il"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Scadenza"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Posizione geografica"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Priorità"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Inizio"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ordina attività"
 
-#: 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 "Nuovo _appuntamento..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Nuovo _evento del giorno"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Nuova riunione"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Nuova attività"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Seleziona _discussione"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Seleziona..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Pubblica le informazioni sulla disponibilità"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Copia nella cartella..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Sposta nella cartella..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "Pianifica una riunione..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "Inoltra come iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "_Elimina questa ricorrenza"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Elimina _tutte le ricorrenze"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Vai a _oggi"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Vai alla data..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "Impostazioni..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5888,26 +5933,26 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -5916,421 +5961,417 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sì (ricorrenza complessa)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Ogni giorno"
+msgid_plural "Every %d days"
+msgstr[0] "Ogni giorno"
+msgstr[1] "Ogni giorno"
 
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Ogni %d giorni"
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Ogni settimana"
+msgid_plural "Every %d weeks"
+msgstr[0] "Ogni settimana"
+msgstr[1] "Ogni settimana"
 
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Ogni %d settimane"
-
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Ogni settimana il "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Ogni settimana il "
+msgstr[1] "Ogni settimana il "
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Ogni %d settimane il "
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " e "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "Il giorno %s di "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "Il %s %s di "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "ogni mese"
+msgid_plural "every %d months"
+msgstr[0] "ogni mese"
+msgstr[1] "ogni mese"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "ogni %d mesi"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Ogni anno"
+msgid_plural "Every %d years"
+msgstr[0] "Ogni anno"
+msgstr[1] "Ogni anno"
 
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Ogni %d anni"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " un totale di %d volte"
+#: 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] " un totale di %d volte"
+msgstr[1] " un totale di %d volte"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", che finisce di "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Comincia:</b>"
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Finisce:</b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Completata:</b>"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>In scadenza:</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 "Informazioni iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "Errore iCalendar"
 
-#: 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 "Partecipante sconosciuto"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Nessuno</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Posizione:"
+
 #. 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 "Stato:"
 
-#: 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 "Accettata"
 
-#: 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 "Accettato con tentativo"
 
-#: 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 "Annullato"
 
-#: 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 "Specificare un'operazione:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Aggiornare"
 
-#: 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 "Accettare"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Accettare con tentativo"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Rifiutare"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Invia informazioni sulla disponibilità"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Aggiorna stato risposta"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Invia informazioni correnti"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annulla"
 
-#: 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> ha pubblicato informazioni riguardo una riunione."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Dettagli della riunione"
 
-#: 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> richiede la presenza di %s ad una riunione."
 
-#: 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> richiede la tua presenza ad una riunione."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Proposta di riunione"
 
-#: 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> vuole aggiungersi ad una riunione esistente."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Aggiornamento riunione"
 
-#: 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> vuole ricevere informazioni aggiornate sulla riunione."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Richiesta di aggiornamento sulla riunione"
 
-#: 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> ha risposto ad una richiesta di riunione."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Risposta ad una riunione"
 
-#: 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> ha annullato una riunione."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Annullamento riunione"
 
-#: 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> ha mandato un messaggio incomprensibile."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Messaggio di richiesta riunione non valido"
 
-#: 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> ha pubblicato informazioni sulle proprie attività."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Informazioni sull'attività"
 
-#: 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> richiede che %s eseguito un compito."
 
-#: 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> ha richiesto che venga eseguito un compito."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Proposta di attività"
 
-#: 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> vuole aggiungere informazioni ad una attività esistente."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Aggiornamento attività"
 
-#: 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> vuole ricevere informazioni aggiornate sull'attività."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Richiesta di aggiornamento dell'attività"
 
-#: 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> ha risposto all'assegnamento di un compito."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Risposta all'attività"
 
-#: 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> ha annullato un'attività."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Annullamento attività"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Messaggio di attività errato"
 
-#: 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> ha pubblicato informazioni sulla disponibilità."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Informazioni sulla disponibilità"
 
-#: 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> richiede informazioni sulla disponibilità."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Richiesta disponibilità"
 
-#: 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> ha risposto a una richiesta di disponibilità."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Risposta di disponibilità"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio di disponibilità errato"
 
-#: 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 "Il messaggio non sembra ben impostato"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Il messaggio contiene solo richieste di tipo non supportato."
 
-#: 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 "L'allegato non contiene un messaggio di calendario valido"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "L'allegato non ha nessun elemento di calendario visibile"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Impossibile aggiornare il file di calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\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 ""
 "Impossibile aggiornare lo stato del partecipante dato che l'elemento non "
 "esiste più"
 
-#: 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 "L'oggetto non è valido e non può essere aggiornato\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 ""
 "Questa risposta non proviene da un partecipante. Aggiungerlo come "
 "partecipante?"
 
-#: 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 ""
 "Impossibile aggiornare lo stato del partecipante: lo stato non è valido!\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 "Si è verificato un errore nel sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Impossibile trovare l'oggetto\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 "Non si possiedono i diritti necessari per aggiornare il calendario\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossibile aggiornare lo stato del partecipante!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Rimozione completata"
 
-#: 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 "Elemento spedito!\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 "L'elemento non può essere spedito!\n"
 
@@ -6465,7 +6506,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6547,12 +6588,12 @@ msgstr "Priorità:"
 msgid "Web Page:"
 msgstr "Pagina web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Fare clic qui per aprire %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"
@@ -6562,7 +6603,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"
@@ -6573,12 +6614,12 @@ msgstr ""
 "%s\n"
 " è andato in crash."
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Lettura attività a %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6587,49 +6628,54 @@ msgstr ""
 "Errore aprendo %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "Caricamento attività"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Completamento azioni..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Rimozione degli oggetti selezionati..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Pulizia"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Caricamento attività"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Caricamento attività"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s"
 
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 "Il backend del calendario per\n"
 "%s\n"
 " è andato in crash."
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"Il backend delle attività per\n"
+"%s\n"
+" è andato in crash."
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Pulizia"
 
@@ -6650,45 +6696,46 @@ msgid "February"
 msgstr "Febbraio"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Vai alla data"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Gennaio"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Luglio"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Giugno"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Maggio"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Ottobre"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Seleziona tutto il testo"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Settembre"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Vai a oggi"
+msgid "_Select Today"
+msgstr "Scegli cartella"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6778,7 +6825,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Compleanni e anniversari"
 
 #. 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 "Sul Web"
 
@@ -6935,81 +6982,81 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Giorno selezionato (%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 "Settimana selezionata (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Mese selezionato (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Anno selezionato (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Attività"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorità: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentuale completata: %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 "Categorie: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Contatti: "
 
-#: 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 "Anteprima di stampa"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Stampa elemento"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
@@ -7018,37 +7065,37 @@ msgstr "Impostazione pagina"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "L'elenco attività '%s' sarà rimosso. Sei sicuro di voler continuare?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Nuova attività"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Attività"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Crea una nuova attività"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Nuovo elenco attività"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "Elenco a_ttività"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Crea un nuovo elenco attività"
 
-#: 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 ""
 "Impossibile aprire l'elenco attività '%s' per creare appuntamenti e riunioni"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Non c'è un calendario accessibile per creare delle attività"
 
@@ -8693,7 +8740,7 @@ msgstr "Impossibile creare il percorso per la cache"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossibile rimuovere la voce cache: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8704,7 +8751,7 @@ msgstr ""
 "Ulteriori operazioni su questo server non saranno ripetute\n"
 "quando ci si riconnette alla rete."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8715,7 +8762,7 @@ msgstr ""
 "%s\n"
 "Le modifiche fatte a questa cartella non saranno risincronizzate."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Sincronizzazione con il server"
 
@@ -8733,7 +8780,7 @@ msgstr "Scaricamento nuovi messaggi per la modalità non in linea"
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparazione cartella '%s' per l'accesso fuorilinea"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "È necessario essere collegati per completare questa operazione"
 
@@ -8848,32 +8895,36 @@ msgstr "(match-all) richiede un singolo risultato booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "É stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Impossibile aggiungere un messaggio a %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Impossibile ricercare attraverso un'espressione in %s (operazione non "
 "supportata)"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Impossibile cercare attraverso l'uid in %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Trasferimento dei messaggi in corso"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Copia messaggi in corso"
 
-#: 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 "Filtraggio nuovi messaggi"
 
@@ -8907,7 +8958,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 "Annullato."
 
@@ -9295,7 +9347,7 @@ msgstr "Le credenziali di riferimento sono scadute."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Risposta di autenticazione dal server errata."
 
@@ -9493,7 +9545,7 @@ msgstr "Errore di elaborazione"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Firmatario: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Impossibile ottenere la cartella: operazione non supportata in questo "
@@ -9504,22 +9556,23 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Impossibile creare la cartella: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: operazione non supportata in questo archivio"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: operazione non valida"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Cestino"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Da cestinare"
 
@@ -9749,17 +9802,17 @@ msgstr "Non é presente il messaggio %s in %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossibile rinominare la cartella %s: operazione non valida"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s: cartella inesistente"
@@ -9793,32 +9846,33 @@ msgstr "Applicare filtri ai nuovi messaggi nella Inbox su questo server"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronizza la posta remota localmente automaticamente"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "Nome server LDAP:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Rubrica"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Base della ricerca:"
+#: 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 "GroupWise Novell"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "Per accedere ai server Groupwise Novell"
 
-#: 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."
@@ -9826,8 +9880,8 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "elenco"
@@ -9835,12 +9889,12 @@ msgstr "elenco"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si é disconnesso inaspettatamente: %s"
@@ -9898,12 +9952,12 @@ msgstr "Cartella distrutta e ricreata sul server."
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: 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 "Impossibile la ricezione del messaggio: %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
@@ -9919,25 +9973,25 @@ msgstr ""
 "Impossibile prendere il messaggio: %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 "Messaggio assente"
 
-#: 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 "Questo messaggio non è al momento disponibile"
 
-#: 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 "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: 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 "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -10010,18 +10064,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e memorizzare la posta su server IMAP."
 
-#: 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 "servizio IMAP per %s su %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
@@ -10031,14 +10085,14 @@ msgstr "servizio IMAP per %s su %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %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 non disponibile"
 
-#: 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
@@ -10046,49 +10100,49 @@ msgstr "SSL non disponibile"
 msgid "Connection cancelled"
 msgstr "Connessione annullata"
 
-#: 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 "Impossibile connettersi al server IMAP.%s in modalità sicura: %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 "Estensione SSL/TLS non supportata"
 
-#: 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 "Negoziazione SSL non riuscita"
 
-#: 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 "Impossibile connettersi con il comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nessun supporto per il tipo di autenticazione %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Non è stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10099,21 +10153,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Non è presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1786
-#: camel/providers/local/camel-maildir-store.c:137
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "Impossibile creare la cartella: %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:2046
+#: 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\""
@@ -10121,12 +10168,20 @@ msgstr ""
 "Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
 "\""
 
-#: camel/providers/imap/camel-imap-store.c:2058
+#: 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
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Impossibile creare la cartella: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartella madre sconosciuta: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non è permesso contenere sottocartelle"
 
@@ -10161,20 +10216,20 @@ msgid "Index message body data"
 msgstr "Indice messaggio corpo dati"
 
 #. $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 "casella di posta: %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)"
@@ -10235,7 +10290,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"
@@ -10284,8 +10339,8 @@ msgstr "Impossibile cancellare il sommario della cartella `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%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 "Impossibile cancellare il sommario della cartella `%s': %s"
@@ -10316,14 +10371,14 @@ msgstr "Contenuto del messaggio non valido"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "La cartella `%s' non esiste."
@@ -10342,7 +10397,7 @@ msgstr "`%s' non è una directory maildir."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
@@ -10351,28 +10406,28 @@ msgstr "Impossibile cancellare la cartella `%s': %s"
 msgid "not a maildir directory"
 msgstr "non è una directory maildir"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossibile esaminare la cartella `%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 "Impossibile aprire il percorso della directory maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Controllo consistenza cartelle"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Verifica nuovi messaggi"
 
-#: 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
@@ -10420,7 +10475,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Costruziono del messaggio non riuscita: casella di posta corrotta?"
 
 #: 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 "Impossibile creare una cartella con questo nome."
 
@@ -10450,30 +10505,30 @@ msgstr "`%s' non è un file regolare."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La Cartella `%s' non è vuota.  Non cancellata."
 
-#: 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 "Impossibile creare la 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 "Impossibile creare la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr "La cartella esiste già"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "Il nuovo nome della cartella è illegale."
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Impossibile rinominare la cartella '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Impossibile rinominare %s con %s: %s"
@@ -10519,7 +10574,7 @@ msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
@@ -10563,14 +10618,14 @@ msgstr "Aggiunta di un messaggio MH annullata"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Impossibile creare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Impossibile avere la cartella %s: %s"
@@ -10866,46 +10921,46 @@ msgstr ""
 "Impossibile eliminare una cartella in un magazzino news: puoi invece "
 "disiscriverti."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "Errore di connessione: %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 "Non è presente la cartella: %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 "Impossibile ricevere il gruppo: %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 "Impossibile ricevere messaggi: errore non specificato"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Comando NNTP non riuscito: %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: Ricerca nuovi messaggi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Risposta del server  sconosciuta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Usa annulla"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operazione non riuscita: %s"
@@ -10952,7 +11007,7 @@ msgstr "Elimina dopo %s giorno(i)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Disabilita il supporto per tutte le estensioni POP3"
 
-#: 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"
 
@@ -11041,7 +11096,7 @@ msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11096,12 +11151,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: 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 ""
 "Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
 
@@ -11223,13 +11279,14 @@ msgid "server does not appear to support SSL"
 msgstr "il server non sembra supportare SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "Richiesta STARTTLS scaduta: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "Comando IMAP fallito: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "Errore nella risposta di STARTTLS"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "Comando IMAP fallito: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11263,156 +11320,158 @@ msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Impossibile inviare il messaggio: senza destinatari."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non è valido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: 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 "Impossibile inviare il messaggio: uno o più destinatari non validi."
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "Saluti SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "Richiesta HELO scaduta: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "Errore nella risposta di HELO"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "Autenticazione SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Errore nel creare un oggetto di autenticazione SASL."
 
-#: 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 "Richiesta AUTH scaduta: %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 "Comando IMAP fallito: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "Richiesta AUTH non riuscita"
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "Comando IMAP fallito: %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 "Risposta di autenticazione dal server errata.\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 "Richiesta MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "Errore nella risposta MAIL FROM"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "Comando IMAP fallito: %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 "La richiesta di RCPT TO: %s: posta non inviata"
 
-#: 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> non riuscito"
 
-#: 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 "RIchiesta di DATA scaduta: %s: posta non inviata."
 
 #. 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 "Errore nella risposta di DATA"
-
-#: 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 ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
-"posta non inviata."
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "Errore di risposta di DATA"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "Comando IMAP fallito: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Richiesta RSET scaduta: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "Errore nella risposta di RSET"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "Richiesta QUIT scaduta: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "Errore nella risposta di QUIT"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "Comando IMAP fallito: %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 "allegato"
 
-#: 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 "Rimuovi gli oggetti selezionati dall'elenco degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Aggiungi allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Allega un file al messaggio"
 
-#: 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 "Impossibile allegare il 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 "Impossibile allegare il file %s: non è un file regolare"
@@ -11434,19 +11493,19 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "È preferibile la visualizzazione automatica degli allegati"
 
-#: 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 "È necessario configurare un'account prima di poter comporre una Email."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destinatario"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Scegli le cartelle per spedirvi il messaggio."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Fare clic qui per la rubrica"
 
@@ -11457,46 +11516,46 @@ msgstr "Fare clic qui per la rubrica"
 #. * 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 "Rispondi-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: 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 ""
 "Indicare gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: 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."
@@ -11507,11 +11566,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Invia a:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "fare clic qui per selezionare le cartelle a cui spedire"
 
@@ -11519,14 +11578,14 @@ msgstr "fare clic qui per selezionare le cartelle a cui spedire"
 msgid "Attach file(s)"
 msgstr "File allegati"
 
-#: 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 ""
 "Impossibile firmare i messaggi in uscita: nessun set di certificati "
 "impostato per questo 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"
@@ -11534,7 +11593,7 @@ msgstr ""
 "Impossibile crittografare il messaggio in uscita: non è stato impostato "
 "nessun certificato di crittografazione per l'account"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11543,30 +11602,30 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: 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 "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11575,7 +11634,7 @@ msgstr ""
 "Impossibile cercare il 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"
@@ -11584,7 +11643,7 @@ msgstr ""
 "Impossibile troncare il 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"
@@ -11593,7 +11652,7 @@ msgstr ""
 "Impossibile copiare il descrittore di file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11602,7 +11661,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %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?"
@@ -11611,7 +11670,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera recuperarli?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11623,42 +11682,47 @@ msgstr ""
 "Salvare le modifiche?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Messaggi multipli"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Attenzione: messaggio modificato"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Firma:"
-
-#: 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 "Autogenerata"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Firma:"
+
+#: 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 allegato"
 msgstr[1] "<b>%d</b> file allegati"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Nascondi la barra _allegati (rilascia qua gli allegati)"
 
-#: 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 "Mostra la barra _allegati (rilascia qua gli allegati)"
 
-#: 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 "Componi un nuovo messaggio"
 
-#: 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."
@@ -11666,7 +11730,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: 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"
@@ -11678,7 +11742,7 @@ msgstr ""
 "Assicurarsi di aver installato la versione corretta\n"
 "di gtkhtml e libgtkhtml.\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."
@@ -11686,7 +11750,7 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "il componente HTML non è disponibile."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11817,7 +11881,7 @@ msgstr ""
 "Quando ricevi una Email con una ricevuta di lettura, cosa dovrebbe fare "
 "Evolution?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11825,15 +11889,15 @@ msgstr ""
 "Esiste già un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Ricorda questa password"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Ricorda questa password per il resto della sessione"
 
@@ -11916,13 +11980,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11931,118 +11995,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 secondo fa"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d secondi fa"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 secondo fa"
+msgstr[1] "1 secondo fa"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 minuto fa"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d minuti fa"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minuto fa"
+msgstr[1] "1 minuto fa"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 ora fa"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d ore fa"
+msgid_plural "%d hours ago"
+msgstr[0] "1 ora fa"
+msgstr[1] "1 ora fa"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 giorno fa"
+msgid_plural "%d days ago"
+msgstr[0] "1 giorno fa"
+msgstr[1] "1 giorno fa"
 
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d giorni fa"
-
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 settimana fa"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 settimana fa"
+msgstr[1] "1 settimana fa"
 
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d settimane fa"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 mese fa"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d mesi fa"
+msgid_plural "%d months ago"
+msgstr[0] "1 mese fa"
+msgstr[1] "1 mese fa"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 anno fa"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d anni fa"
+msgid_plural "%d years ago"
+msgstr[0] "1 anno fa"
+msgstr[1] "1 anno fa"
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "È necessario indicare una data."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<fare clic qui per selezionare una data>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "adesso"
 
 #. 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 "Scegliere un tempo da confrontare"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Regole dei filtri"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "È necessario indicare un nome file."
 
-#: 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 "Il file `%s' non esiste oppure non è un file regolare."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Scegli un file"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Di"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>In scadenza:</b>"
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "È necessario indicare una cartella."
 
-#: 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 "Scegli cartella"
 
@@ -12056,23 +12108,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 "Importante"
 
 #. 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 "Da fare"
 
 #. 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 "Più tardi"
 
-#: 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"
 
@@ -12080,59 +12132,63 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "È necessario assegnare un nome a questo filtro."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Nome della regola:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Se"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>In scadenza:</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sono soddisfatti"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "se qualche criterio è soddisfatto"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "in entrata"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "in uscita"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Confronta con"
+msgid "    "
+msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Modifica filtri"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Regole dei filtri"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Modifica vfolder"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Sorgenti delle cartelle virtuali"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Confronta con"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "In entrata"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "In uscita"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12140,7 +12196,7 @@ msgstr ""
 "La data del messaggio verrà confrontata\n"
 "con le 12:00am di quella specificata."
 
-#: 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."
@@ -12148,7 +12204,7 @@ msgstr ""
 "La data del messaggio verrà confrontata\n"
 "con un ora relativa all'utilizzo del filtro."
 
-#: 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."
@@ -12156,59 +12212,51 @@ msgstr ""
 "La data del messaggio verrà confrontata\n"
 "con l'ora corrente all'utilizzo del filtro."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Cartelle virtuali"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "una data relativa a quellla corrente"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "fa"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "mesi"
 
-#: 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 " secondi"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "solo le cartelle specificate"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "L'ora corrente"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "la data specificata"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "Sorgenti delle cartelle virtuali"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "settimane"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "tutte le cartelle remote attive"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "tutte le cartelle locali e remote attive"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "tutte le cartelle locali"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "anni"
 
@@ -12341,7 +12389,7 @@ msgstr "non è segnato"
 msgid "Junk Test"
 msgstr "Test spazzatura"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etichetta"
@@ -12371,8 +12419,9 @@ msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Manda messaggio in pipe ad un comando della shell"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Esci dal programma"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12406,23 +12455,24 @@ msgstr "ritorna maggiore di"
 msgid "returns less than"
 msgstr "ritorna minore di"
 
-#: 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 "Esegui programma:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Imposta _stato"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Comando della shell"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
@@ -12447,9 +12497,9 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Oggetto"
@@ -12458,17 +12508,13 @@ msgstr "Oggetto"
 msgid "Unset Status"
 msgstr "Deimposta stato"
 
-#: 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 "Il nome della regola '%s' non è unico, scegline un altro."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Regole"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Aggiungi regola"
 
@@ -12480,8 +12526,9 @@ msgstr "Modifica regola"
 msgid "Rule name"
 msgstr "Nome della regola"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Regole di punteggio"
 
 #: filter/searchtypes.xml.h:1
@@ -12516,15 +12563,20 @@ msgstr "L'oggetto contiene"
 msgid "Subject does not contain"
 msgstr "L'oggetto non contiene"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Cartelle virtuali"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "È necessario assegnare un nome a questa cartella virtuale."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "È necessario specificare almeno una cartella come sorgente."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "Sorgente delle cartelle virtuali"
 
@@ -12577,8 +12629,8 @@ msgstr "Visualizzatore delle le cartelle di posta di Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Controllo delle preferenze della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Posta"
@@ -12587,53 +12639,50 @@ msgstr "Posta"
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: 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 "Preferenze di posta"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Cancellare questo account?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Non cancellare"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Predefinito]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Nome dell'account"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: 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 "Senza nome"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Specificare un nome script valido."
 
-#: 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 "Lingue"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Aggiungi firma script"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Aggiungi firma"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Firme"
 
@@ -12691,7 +12740,7 @@ msgstr ""
 "Impossibile aprire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea una cartella _virtuale dalla ricerca..."
 
@@ -12721,288 +12770,318 @@ msgstr "Messaggi non letti"
 msgid "<click here to select a folder>"
 msgstr "<fare clic qui per selezionare una cartella>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Crea nuova cartella"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificare dove creare la cartella:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome della cartella:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "NONRISCONTRATO"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Posta in arrivo"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Sto caricando..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Rimozione cartella %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Lettura cartella %s in corso"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Sposta messaggii in %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copia messaggi in %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Impossibile rinominare la cartella %s: operazione non valida"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Archiviazione cartella '%s'"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Crea cartella"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Impossibile cancellare la cartella: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Cancellare la cartella \"%s\" e tutte le sottocartelle?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Elimina \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Impossibile rinominare la cartella %s: cartella inesistente"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Rinomina cartella"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Una cartella di nome \"%s\" esiste già. Usare un altro nome."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Visualizza"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Apri in una nuova _finestra"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Sposta"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Nuova cartella..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Modifica come nuovo messaggio..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Rispondi alla _lista"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Rispondi a _tutti"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Segue..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Flag completata"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Flag annullata"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Segna come _letto"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Segna come non letto"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Segna come _importante"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Segna come non i_mportante"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Segna come _da cancellare"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Segna come _non da cancellare"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi mittente alla ru_brica"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Applica _filtri"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Regole dei filtri"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "Cartella virtuale sull'_oggetto"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _mittente"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _destinatari"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla mailing _list"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr "Cartella virtuale sull'argomento"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_oggetto"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _mittente"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _destinatari"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _mailing list"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr "Filtro sull'argomento"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Predefinito"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Stampa messaggio"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo del collegamento"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Fare clic per spedire %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 "Corrisponde: %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 "Non firmato"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13011,11 +13090,11 @@ msgstr ""
 "Questo messaggio non è firmato. Non c'è garanzia che il mittente sia "
 "autentico."
 
-#: 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 "Firma valida"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13024,11 +13103,11 @@ msgstr ""
 "Questo messaggio è firmato ed è valido. Chi ha spedito il messaggio è molto "
 "probabilmente chi sostiene di essere."
 
-#: 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 "Firma errata"
 
-#: 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."
@@ -13036,11 +13115,11 @@ msgstr ""
 "La firma di questo messaggio non può essere verificata. Può essere stata "
 "alterata durante il transito."
 
-#: 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 "Firma valida, non è possibile verificare il mittente"
 
-#: 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."
@@ -13048,11 +13127,11 @@ msgstr ""
 "Il messaggio è firmato con una firma valida ma chi ha spedito il messaggio "
 "non può essere verificato."
 
-#: 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 "Non decifrato"
 
-#: 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."
@@ -13060,11 +13139,11 @@ msgstr ""
 "Il messaggio non è cifrato. Il suo contenuto può essere letto durante il "
 "tragitto attraverso 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 "Cifrato, crittografia debole"
 
-#: 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 "
@@ -13074,11 +13153,11 @@ msgstr ""
 "difficile, ma non impossibile che un estraneo abbia letto il contenuto di "
 "questo messaggio in un tempo ragionevolmente breve."
 
-#: 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 "Cifrato"
 
-#: 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."
@@ -13086,11 +13165,11 @@ msgstr ""
 "Questo messaggio è crittografato. È difficile che un estraneo possa leggere "
 "il contenuto del messaggio."
 
-#: 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 "Cifrato, crittografia forte"
 
-#: 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 "
@@ -13100,32 +13179,32 @@ msgstr ""
 "Dovrebbe essere molto difficile che un estraneo riesca a vedere il contenuto "
 "di questo messaggio in un tempo ragionevole."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Visualizza certificato"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Scadute:"
 
 # per il %d %b %l:%M %p
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Nascondi"
 
@@ -13134,125 +13213,160 @@ msgstr "_Nascondi"
 msgid "Page %d of %d"
 msgstr "Pagina %d di %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 "Scaricamento di '%s'"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformulata."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%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 "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Formattazione messaggio in corso"
 
-#: 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 "Da"
 
-#: 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 "Rispondi-a"
 
-#: 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 "A"
 
-#: 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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Gestore di posta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: 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 allegato"
 
-#: 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 "Impossibile interpretare il messaggio S/MIME: errore sconosciuto"
 
-#: 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 "Errore interno: uid in formato non valido: %s"
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Formato firma non supportato"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Errore interno: uid in formato non valido: %s"
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrato)"
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Ogni anno"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Ogni settimana"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "ogni mese"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13265,22 +13379,22 @@ msgstr ""
 "\n"
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
-#: 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 "Fallita la migrazione di cache uid pop3: %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 "Fallita la migrazione dello stato di espansione della cartella: %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 "Impossibile creare una cartella `%s': %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Impossibile aprire un archivio per `%s': %s"
@@ -13319,32 +13433,32 @@ msgstr "_Aggiungi alla rubrica"
 msgid "Open in %s..."
 msgstr "Apri 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 "Questo store non supporta le sottoscrizioni o non sono abilitate."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Iscritto"
 
-#: 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 "Cartella"
 
 #. 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 "Selezionare un server."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Nessun server è stato selezionato"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13353,25 +13467,25 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. 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 "Lì %A, %Y/%m/%d alle %H:%M, %%+05d, %%s ha scritto:"
 
-#: 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"
@@ -13380,7 +13494,7 @@ msgstr ""
 "Impossibile salvare su: `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13389,35 +13503,35 @@ msgstr ""
 "`%s' esiste già.\n"
 "Sovrascriverlo?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "messaggio"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Errore: '%s' esiste e non è un file regolare."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Salva messaggio..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Aggiungi indirizzo"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail da %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %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 `%"
@@ -13430,7 +13544,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: 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"
@@ -13502,50 +13616,60 @@ msgid "Default height of the Message Window"
 msgstr "Oggetto predefinito del messaggio."
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Oggetto predefinito del messaggio."
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Stile della risposta predefinito"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Larghezza predefinita del pannello cartelle"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Larghezza predefinita del pannello cartelle"
 
-#: 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 "Larghezza predefinita del pannello cartelle"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Mostra gli errori di battitura sulle parole mentre le si scrive."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Svuota i cestini all'uscita"
 
-#: 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 "Svuota tutti i cestini all'uscita di 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 ""
 "Abilita la modalità cursore visibile, in maniera da visualizzare il cursore "
 "mentre si legge la posta."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Abilita/disabilità la modalità cursore visibile"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Altezza del pannello elenco messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Altezza del pannello elenco messaggi."
 
-#: 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 "
@@ -13556,15 +13680,19 @@ msgstr ""
 "visualizzato. È però necessario che possa essere associato al database di "
 "tipi mime nel componente visualizzatore bonobo di Gnome."
 
-#: 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 "Elenco delle etichette e dei colori associati"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Elenco degli account"
 
-#: 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."
@@ -13573,11 +13701,11 @@ msgstr ""
 "contiene delle stringhe che identificano le cartelle relative a /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 "Elenco delle intestazioni personalizzate e se sono abilitate."
 
-#: 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."
@@ -13586,17 +13714,17 @@ msgstr ""
 "L'elenco contiene delle stringhe che contengono a loro volta delle coppie "
 "nome:colore dove il colore usa la notazione esadecimale dell'HTML."
 
-#: 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 ""
 "Elenco dei tipi mime da controllare per i componenti di visualizzazione di "
 "bonobo"
 
-#: 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 "Carica le immagini dei messaggi HTML attraverso l'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 - "
@@ -13606,83 +13734,91 @@ msgstr ""
 "non scarica mai le immagini dalla rete 1 - scarica le immagini se chi le "
 "spedisce è presente nella rubrica 2 - scarica sempre le immagini dalla rete"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Azioni di filtraggio dei log"
 
-#: 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 "Azioni di filtraggio sul file log specificato."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "File di log per controllare le azioni dei filtri"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "File di log per controllare le azioni dei filtri."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Segna come letto dopo un tempo specificato"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Segna come letto dopo un tempo specificato."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Segna le citazioni nell'anteprima del messaggio"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Segna le citazioni nell'anteprima del messaggio."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Stile di visualizzazione messaggio (normale, intestazioni complete, sorgente)"
 
-#: 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 "Nuovo file sonoro di notifica nuova posta"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Nuovo tipo di notifica nuova posta"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Segnala se l'oggetto è vuoto"
 
-#: 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 "Avverte l'utente quando si cerca di eliminare una cartella."
 
-#: 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 ""
 "Avverte l'utente quando si cerca di spedire un messaggio sprovvisto di "
 "oggetto."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Avverte l'utente quando elimina qualcosa"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Avverte l'utente quando si compila solo il campo 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."
@@ -13690,93 +13826,105 @@ msgstr ""
 "Chiedi conferma prima di inviare messaggi HTML a contatti che non li "
 "desiderano."
 
-#: 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 "Segnala l'invio di messaggi senza i campi A o Cc."
 
-#: 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 "Avverte l'utente quando si cerca di spedire HTML non desiderato"
 
-#: 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 "Riconosce i collegamenti nel testo e li sostituisce."
 
-#: 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 "Riconosce le faccine nel testo e le sostituisce con delle immagini."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Esegue dei controlli sullo spam sulla posta ricevuta"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "OpZiOnE SeGrEtA"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "OpZiOnE SeGrEtA"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Invio posta predefinito in HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Invio posta predefinito in HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Mostra animazioni"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Mostra le immagini animate come animazioni."
 
-#: 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 ""
 "Mostra messaggi cancellati (con una riga sopra) nell'elenco dei messaggi."
 
-#: 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 "Mostra i messaggi cancellati nell'elenco messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Mostra nel pannello \"Anteprima\""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Mostra nel pannello \"Anteprima\"."
 
-#: 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 "Avvisa con un segnale acustico quando arriva nuova posta."
 
-#: 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 ""
 "Specifica il tipo di notifica posta in arrivo che l'utente intende usare."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Controllo ortografico automatico"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Carattere del terminale"
 
-#: 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 "Il carattere da terminale per la visualizzazione della posta"
 
-#: 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 "Il carattere a larghezza variabile per la visualizzazione dei messaggi"
 
-#: 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;"
@@ -13788,99 +13936,99 @@ msgstr ""
 "visualizzate. Il formato della struttura è &lt;intestazione abilitata&gt; - "
 "impostata se l'intestazione deve essere mostrata con la posta."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Elenca per discussioni."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Elenca per discussioni"
 
-#: 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 "Elenca per discussioni basate sul soggetto"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Tempo necessario per marcare un messaggio come letto"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Tempo necessario per marcare un messaggio come letto."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Stringa UID dell'account predefinito."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usa il demone ed il client Spamassassin"
 
-#: 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 "Usa il client e il demone Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Usa caratteri personalizzati"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Usa caratteri personalizzati per mostrare la posta"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "Usa solo test di spam locale."
 
-#: 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 "Usa solo test di spam locale (senza DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Carattere a larghezza variabile"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "La voce di menu Mostra/Bcc è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "La voce di menu Mostra/Bcc è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "La voce di menu Mostra/Cc è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "La voce di menu Mostra/Cc è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "La voce di menu Mostra/Da è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "La voce di menu Mostra/Da è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "La voce di menu Mostra/Posta a è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "La voce di menu Mostra/Posta a è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "La voce di menu Mostra/Rispondi a è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "La voce di menu Mostra/Rispondi a è selezionata."
 
-#: 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."
@@ -13888,11 +14036,11 @@ msgstr ""
 "Reimposta l'elenco per discussione in base al soggetto se i messaggi non "
 "contengono le intestazioni In-Risposta-A o Riferimenti."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "porta per l'esecuzione utente di spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "porta di spamd"
 
@@ -13931,14 +14079,14 @@ msgstr "Evolution sta importando posta da Elm"
 #: 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 "Importazione in corso..."
 
 #: 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 "Attendere"
 
@@ -13987,12 +14135,12 @@ msgstr "Importazione file"
 msgid "Scanning %s"
 msgstr "Scansione di \"%s\""
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro Priorità \"%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"
@@ -14019,7 +14167,7 @@ msgstr ""
 "Controllare i filtri di importazione in modo che funzionino come \n"
 "previsto."
 
-#: 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"
@@ -14030,7 +14178,7 @@ msgstr ""
 " \"Ignora il Thread\" o \"Controlla il Thread\", non supportata da\n"
 "Evolution. Questi filtri saranno tralasciati."
 
-#: 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"
@@ -14044,24 +14192,24 @@ msgstr ""
 "modificati per controllare se una stringa è o non è contenuta\n"
 "nel corpo del messaggio."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Filtri di posta"
 
-#: 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?"
@@ -14094,62 +14242,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Formato corrente:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Indice contenuto del corpo dei messaggi"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nuovo formato:"
-
-#: 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 ""
-"Attenzione: durante la conversione di formati di mailbox,\n"
-"un errore (come una mancanza di spazio su disco) può non essere\n"
-"recuperabile automaticamente.  Usare con cautela."
-
-#: 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 "Non sono state fornite tutte le informazioni richieste."
 
 #. 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 "Editor degli account di Evolution"
 
-#: 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 "_Nome utente:"
 
-#: 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 "_Percorso:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Non è possibile creare due account con lo stesso nome."
 
@@ -14182,11 +14296,11 @@ msgstr "Risposta a %s"
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di filtro"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Le seguenti regole di filtro:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14197,46 +14311,46 @@ msgstr ""
 "    '%s'\n"
 "e quindi sono state aggiornate."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Nuovo messaggio di posta"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "Invia _messaggio"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio di posta"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nuova cartella virtuale"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Filtri di posta"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crea un nuovo calendario"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr "URI della sorgente posta che la vista mostrerà"
 
-#: 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 "Identità"
 
-#: 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 "
@@ -14246,11 +14360,12 @@ msgstr ""
 "\"opzionali\",\n"
 "a meno che non si desideri includere queste informazioni alle Email spedite."
 
-#: 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 "Ricezione posta"
 
-#: 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."
@@ -14259,15 +14374,15 @@ msgstr ""
 "entrata. Se non si è sicuri, chiedere\n"
 "all'amministratore di sistema o al provider Internet."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Selezionare una delle seguenti opzioni"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Spedizione posta"
 
-#: 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."
@@ -14276,11 +14391,11 @@ msgstr ""
 "non si è sicuri, chiedere all'amministratore di sistema o al provider "
 "Internet."
 
-#: 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 "Gestione degli account"
 
-#: 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 "
@@ -14294,123 +14409,256 @@ msgstr ""
 "un nome per questo account nello spazio sottostante. Questo nome è usato "
 "solo a scopo identificativo."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Verifica servizi"
 
-#: 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 "Connessione al 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 "_Controlla tipi supportati"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Anteprima"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL non è supportato in questa compilazione di Evolution)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL non è supportato in questa compilazione di Evolution)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Stato:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Stato:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>Intestazioni _della posta visualizzate</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 "Cifra anche con _la mia chiave inviando posta cifrata"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Editor account"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Informazioni sull'account"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Controllo nuova posta"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Aggiungi script"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Aggiungi nuova firma..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Cifra sempre con la mia chiave durante l'invio di posta crittografata"
+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>Intestazioni _della posta visualizzate</b>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Sempre copia carbone _nascosta (Bcc) a:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Sempre _copia carbone (Cc) a:"
+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 "Notifica nuova posta"
+
+#: 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 "Messaggi inviati e bozze"
+
+#: 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 "Cifra anche con _la mia chiave inviando posta cifrata"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Editor account"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Aggiungi nuova firma..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Aggiungi script"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Cifra sempre con la mia chiave durante l'invio di posta crittografata"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Sempre _copia carbone (Cc) a:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Sempre copia carbone _nascosta (Bcc) a:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Firma _sempre i messaggi in uscita quando viene usato questo account"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sempre chiavi di fiducia nel mio mazzo di chiavi quando crittografo"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Allega messaggio originale"
 
-#: 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 "Allegato"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autenticazione"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "Inserisci _automaticamente immagini delle faccine"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Controlla la posta _automaticamente ogni"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "Emetti un suono quando arriva nuova posta"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Set di caratteri:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "C_olori"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "_Controlla tipi supportati"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Controllo arr_ivo nuova posta"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Controlla l'ortografia durante la digitazione"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Controllo nuova posta"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Controlla se la posta in arrivo è da cestinare"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Colore per errori di ortografia:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Composizione messaggio"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "C_olori"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Configurazione"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14426,273 +14674,261 @@ msgstr ""
 "\n"
 "Fare clic su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Comportamento predefinito"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Codice dei caratteri predefinito:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Cancellazione posta"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Firma _sempre i messaggi in uscita (predefinito)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "Pre_definiti"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Non citare il messaggio originale"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Non firmare le richieste di riunione (per compatibilità con Outlook)"
 
-#: 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 "Completato"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "Cartella delle bozze:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Cartelle Email"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "Indirizzo Email:"
 
-#: 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 "Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficato di crittazione:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Guida agli account di Evolution"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Larghezza fissa:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Opzioni filtri"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Proprietà caratteri"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Formato messaggi in _HTML"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "Posta _HTML"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Int_estazioni"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Evidenzia citazioni con"
 
-#: 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 "Etichette e colori"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Caricamento immagini"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Configurazione della posta"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Collocazione della casella di posta"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Compositore messaggio"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Visualizzazione messaggio"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Carattere del messaggio"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Notifica nuova posta"
-
-#: 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"
 msgstr "Nota: non verrà richiesta una password fino alla prima connessione"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Informazioni opzionali"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganizzazione:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "Avvisa con un segnale acustico quando arriva nuova posta"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
 
-#: 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 "Caratteri di stampa"
-
-#: 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 "Cita messaggio originale"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Ri_corda questa password"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Ricorda la password"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Rispondi-a:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "_Opzioni di ricezione"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Ricorda questa _password"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Informazioni richieste"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Ripristina predefiniti"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Ricorda la password"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "Sicur_ezza"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "Carattere _standard:"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME sicuro (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Sicurezza"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Seleziona font a larghezza fissa HTML"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleziona carattere HTML a larghezza fissa per la stampa"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Seleziona carattere HTML a larghezza variabile"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_Seleziona..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Messaggi inviati e bozze"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Configurazione del server"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "_Tipo di server:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "Certificato di fir_ma:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Firma:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "Firme"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Specifica nome del _file:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "Carattere del _terminale:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Tipo:"
+
+#: 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"
@@ -14702,7 +14938,7 @@ msgstr ""
 "firma. Il nome specificato avrà solo scopo \n"
 "visivo."
 
-#: 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 "
@@ -14712,7 +14948,7 @@ msgstr ""
 "ortografico e la lingua. L'elenco delle lingue riflette solamente le lingue "
 "di cui si ha il dizionario installato."
 
-#: 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\""
@@ -14720,15 +14956,15 @@ msgstr ""
 "Indicare il nome con il quale ci si vuole riferire a questo account.\n"
 "Per esempio: \"Lavoro\" o \"Personale\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Usa il _demone"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Larghezza variabile:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14738,178 +14974,111 @@ msgstr ""
 "\n"
 "Fare clic su \"avanti\" per cominciare."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Aggiungi firma"
 
-#: 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 "_Carica sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Firma _sempre i messaggi in uscita quando viene usato questo account"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "Tipo di _autenticazione: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "Tipo di _autenticazione: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Controlla la posta _automaticamente ogni"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "Inserisci _automaticamente immagini delle faccine"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "Emetti un suono quando arriva nuova posta"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Chiedi conferma prima di eliminare definitivamente i messaggi"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "Firma pre_definita:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "Pre_definiti"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Firma _sempre i messaggi in uscita (predefinito)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo _di nuova posta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "Abilita"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Crittografa messaggi in uscita (predefinito)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "Stile inoltro:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Nome e cognome:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "Posta _HTML"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identità"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "Da _cestinare"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "Carica _le immagini se il mittente è nella rubrica"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "Solo per _test locali"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "Imposta co_me account predefinito"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: 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 "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "Avvisa con un segnale acustico quando arriva nuova posta"
-
-#: 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 ""
 "Chiedi conferma _prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi senza oggetto"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Ricezione posta"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "Stile _risposta:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Ripristina predefiniti"
-
-#: 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 "_Seleziona..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Spedizione posta"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Mostra immagini animate"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "Firme"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "Carattere _standard:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "Carattere del _terminale:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Usa connessione sicura (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Usa gli stessi caratteri delle altre applicazioni"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minuto(i)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "colore"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping a %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14918,7 +15087,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14927,7 +15096,7 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "In elaborazione"
 
@@ -14935,16 +15104,16 @@ msgstr "In elaborazione"
 msgid "Filtering Folder"
 msgstr "Filtraggio cartella"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Ricezione posta"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fallita l'applicazione dei filtri in uscita: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14953,116 +15122,115 @@ msgstr ""
 "Fallita l'aggiunta a %s: %s\n"
 "Aggiungo invece in locale alla cartella 'Sent'."
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Impossibile aggiungere nella cartella locale 'Sent': %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Invio di \"%s\" in corso"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio del messaggio %d di %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
 msgstr "Errore al messaggio %d di %d"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Salvataggio del messaggio nella cartella"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Lettura store %s in corso"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Aggiornamento cartella"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Svuotamento cestino in '%s'"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Ricezione di %d messaggio(i)"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Ricezione di %d messaggio(i)"
+msgstr[1] "Ricezione di %d messaggio(i)"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Salvataggiodi %d messaggio(i)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Salvataggiodi %d messaggio(i)"
+msgstr[1] "Salvataggiodi %d messaggio(i)"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15071,7 +15239,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15080,11 +15248,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15093,25 +15261,21 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr "Cambio stato da cestinare"
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Sensibile alle maiuscole"
@@ -15124,84 +15288,80 @@ msgstr "Trova nel Messaggio"
 msgid "Find:"
 msgstr "Trova:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Cerca"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Firma digitale"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Cifratura"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "Informazioni di sicurezza"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tipo: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Percorso %s, tipo: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Invia e ricevi posta"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "_Annulla tutto"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: 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 "In attesa..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la password per %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Ricorda questa password"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ricorda questa password per il resto della sessione"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Impossibile memorizzare la firma: %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"
@@ -15211,23 +15371,23 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "Annulla i cambiamenti"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Salva firma"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Modifica firma"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Inserire un nome per questa firma."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nome:"
 
@@ -15257,17 +15417,17 @@ msgstr "Messaggio inoltrato"
 msgid "Invalid folder: `%s'"
 msgstr "Cartella non valida: `%s' "
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Impostazione cartella virtuale %s in corso"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aggiornamento cartella virtuale per %s in corso"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15280,84 +15440,84 @@ msgstr ""
 "    '%s'\n"
 "che ora è stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Modifica cartella virtuale"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Si è cercato di modificare una cartella virtuale (%s) che non esiste."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Nuova cartella virtuale"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi multipli non visti"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Messaggi multipli"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Il più basso"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Più basso"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Più alto"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Il più alto"
 
-#: 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 "Oggi %I:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %I:%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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Generazione elenco messaggi"
 
@@ -15405,7 +15565,7 @@ msgstr "Segue"
 msgid "For Your Information"
 msgstr "Per informazione"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Inoltra"
 
@@ -15413,11 +15573,11 @@ msgstr "Inoltra"
 msgid "No Response Necessary"
 msgstr "Non è necessario rispondere"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Rispondi a tutti"
 
@@ -15442,7 +15602,8 @@ msgstr ""
 "Selezionare un'azione seguente dal menu \"Segnalazioni\"."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "Scadenza il:"
 
 #: mail/message-tags.glade.h:7
@@ -15656,7 +15817,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Annulla la riunione su questo argomento"
 
-#: 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 "Selezionare il tipo di informazioni che si desidera importare:"
 
@@ -15685,26 +15846,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleziona importatore"
 
-#: 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 "Il file %s non esiste"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importazione"
 
-#: 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 "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15713,31 +15874,31 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "Nome del _file:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "_Tipo di file:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Importa dati e impostazioni da programmi vecchi"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Importa un file _singolo"
 
-#: 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"
@@ -15745,26 +15906,26 @@ msgstr ""
 "Attendere...\n"
 "Ricerca di impostazioni esistenti"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Avvio degli importatori intelligenti"
 
-#: 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 "Da %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Esecuzione di gpg non riuscita."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importa"
 
@@ -15772,7 +15933,7 @@ msgstr "_Importa"
 msgid "Closing connections..."
 msgstr "Chiusura connessione..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Impostazioni di Evolution"
 
@@ -15806,11 +15967,11 @@ msgstr "Impossibile aprire la cartella condivisa: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Impossibile trovare la cartella condivisa specificata."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Inizio importazione"
 
-#: 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 "
@@ -15824,10 +15985,6 @@ msgstr ""
 "\n"
 "Vuoi davvero uscire dall'assitente?"
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "Esci dall'assistente"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nessun nome di cartella specificato."
@@ -15869,15 +16026,15 @@ msgstr "Bug buddy non può essere eseguito."
 msgid "About Ximian Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_In linea"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Non in linea"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Non in linea"
 
@@ -15933,7 +16090,6 @@ msgstr "Crocette"
 
 #: 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 "Nuovo"
 
@@ -15987,16 +16143,17 @@ msgid "Create a new test item"
 msgstr "Crea una nuova voce di test"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Connessioni attive"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Fare clic su OK per chiudere queste connessioni e disconnettersi"
+msgid "Active Connections"
+msgstr "Connessioni attive"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "In questo momento sono attive le seguenti connessioni:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Fare clic su OK per chiudere queste connessioni e disconnettersi"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16120,28 +16277,28 @@ msgstr ""
 "Questa guida vi accompagnerà attraverso il processo\n"
 "di importazione di file esterni in Evoution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importatori"
 
-#: 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 "Importa"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Non importare"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Non chiedere di nuovo"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution può importare dati dai seguenti file:"
 
 #. 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"
@@ -16177,7 +16334,7 @@ msgstr ""
 "Speriamo che il risultato dei nostri sforzi Vi piaccia e attendiamo con\n"
 "ansia i Vostri contributi!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16185,48 +16342,48 @@ msgstr ""
 "Grazie\n"
 "Il Gruppo Evolution di Ximian\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Non chiedere più"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossibile inizializzare la shell di Ximian Evolution."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di Ximian Evolution: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Attivazione del componente Evolution specificato."
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Inizia in modalità non in linea"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Inizia in modalità in linea"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Forza la chiusura di tutti i componenti di Evolution"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un 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"
@@ -16235,43 +16392,54 @@ msgstr ""
 "%s: --online e --offline non possono essere usati insieme.\n"
 "  Usa %s --help per ulteriori informazioni.\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 "Seleziona un certificato da importare..."
 
-#: 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 "Nome certificato:"
 
-#: 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 "Scopi"
 
-#: 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 "Numero di serie"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Scadenza"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "Indirizzo Email"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizzatore certificato: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Inserire la password per `%s'"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Inserire la password per %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Inserire la password"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16464,7 +16632,8 @@ msgstr "Avete certificati su file che identificano queste persone:"
 msgid "Your Certificates"
 msgstr "I Vostri certificati"
 
-#: 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 "Il certificato esiste già"
 
@@ -16736,7 +16905,7 @@ msgstr "Sposta contatto(i) in un'altra cartella..."
 msgid "Move to Folder..."
 msgstr "Sposta nella cartella..."
 
-#: 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 "Incolla gli Appunti"
 
@@ -16745,8 +16914,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Anteprime dei contatti da stampare"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Anteprima di sta_mpa"
 
@@ -16794,13 +16963,13 @@ msgstr "Arresta caricamento"
 msgid "View the current contact"
 msgstr "Mostra il contatto corrente"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Azioni"
 
@@ -16821,14 +16990,10 @@ msgid "_Save as VCard"
 msgstr "_Salva come VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Cerca contatti"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Seleziona tutto"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "Invia un messaggio al contatto..."
 
@@ -16836,58 +17001,54 @@ msgstr "Invia un messaggio al contatto..."
 msgid "Day"
 msgstr "Giorno"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Elimina tutte le ricorrenze"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Elimina appuntamento"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Elimina questa ricorrenza"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Elimina questa ricorrenza"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Vai a"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Torna indietro"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Vai avanti"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Vai alla _data"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Vai ad una data specifica"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Vai a oggi"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Elenco"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mese"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Successivo"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Anteprime del calendario da stampare"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Precedente"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Stampa questo calendario"
@@ -16896,7 +17057,7 @@ msgstr "Stampa questo calendario"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Rende note le informazioni sulla disponibilità per questo calendario"
 
-#: 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 "Puli_zia"
 
@@ -16905,34 +17066,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Pulizia dai vecchi appuntamenti e incontri"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Seleziona tutto il testo"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Vai ad una data specifica"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Scegli cartella"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Mostra come elenco"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Mostra un giorno"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Mostra un mese"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Mostra una settimana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: 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 "Oggi"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Mostra l'appuntamento corrente"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Settimana"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Apri appuntamento"
 
@@ -17197,7 +17378,7 @@ msgstr "Segna _tutti come letti"
 msgid "Mark all visible messages as read"
 msgstr "Segna tutti i messaggi visibili come letti"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Incolla messaggio(i) dagli Appunti"
 
@@ -17366,307 +17547,309 @@ msgid "F_orward As..."
 msgstr "In_oltra a..."
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Regole dei filtri"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtro sulla mailing _list..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtro sul _mittente..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtro sui _destinatari..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtra sull'_oggetto..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Segna i messaggi selezionati come da cestinare"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Segnala messaggio(i) selezionato(i) come seguente"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Segue..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forza il caricamento delle immagini della posta HTML"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Inoltra il messaggio selezionato come corpo di un nuovo messaggio"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Inoltra il messaggio selezionato citato come in una risposta"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Inoltra il messaggio selezionato a qualcuno"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Inoltra come allegato il messaggio selezionato a qualcuno"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Aumenta la dimensione del testo"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Carica le _immagini"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Segna come i_mportante"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Segna come _non letto"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Segna come non im_portante"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Segna i messaggi selezionati come se fossero stati letti"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Segna i messaggi selezionati come importanti"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Segna i messaggi selezionati come da cestinare"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Segna i messaggi selezionati come non da cestinare"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Segna i messaggi selezionati come se non fossero stati letti"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Segna i messaggi selezionati come non importanti"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Segna i messaggi selezionati per cancellarli"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Sposta"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Sposta i messaggi in un'altra cartella"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Successivo"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Messaggio _importante successivo"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Discussione successiva"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Messaggo non letto successivo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Non da scartare"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Apre il messaggio selezionato in una nuova finestra"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Apre il messaggio selezionato in una finestra di composizione per rinviarlo"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Dimensione _predefinita"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "Messaggio non letto p_recedente"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Ris_pondi al messaggio"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Rispondi al messaggio in una cartella pubblica"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Messaggio importante pr_ecedente"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Anteprima del messaggio da stampare"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Precedente"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Stampa questo messaggio"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Re_invia"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reinvia (rimbalza) il messaggio selezionato a qualcuno"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Reimpostare il testo alla dimensione originale"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "C_erca nel messaggio..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "Più _piccolo"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Salva il messaggio come un file di testo"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Effettua una ricerca nel messaggio visualizzato"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Imposta i parametri della pagina per la stampante corrente"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Mostra _sorgente dell'Email"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Mostra intesta_zioni complete"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra un cursore lampeggiante nel corpo del messaggio"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Mostra messaggio in stile normale"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Mostra messaggio con tutte le intestazioni dell'Email"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Mostra il sorgente grezzo del messaggio"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Dimensione del _testo"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Annulla la cancellazione del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "Cartella virtuale sulla mailing _list..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "Cartella virtuale sul _mittente..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "Cartella virtuale sui _destinatari..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "Cartella virtuale sull'_oggetto..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copia nella cartella"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crea filtro dal messaggio"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "Vai a"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "Più _grande"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "Visualizzazione _messaggio"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Sposta nella cartella"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "Messaggio successivo"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "Visualizzazione _normale"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Apri messaggio"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "Messaggio _precedente"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "_Rispedisci..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "S_trumenti"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Ripristina"
 
@@ -17933,39 +18116,39 @@ msgstr "Copia attività selezionata"
 msgid "Cut selected task"
 msgstr "Taglia attività selezionata"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Elimina attività completate"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Elimina attività selezionate"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Segna come completato"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Segna attività selezionate come completate"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Incolla attività dagli Appunti"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Anteprime degli elenchi delle azioni da stampare"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Stampa l'elenco delle azioni"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Mostra l'attività selezionata"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Apri attività"
 
@@ -18096,10 +18279,15 @@ msgid "_Day View"
 msgstr "Vista giornaliera"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Vista elenco"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Vista _mensile"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Vista settimana lavorativa"
 
@@ -18128,10 +18316,16 @@ msgid "_Messages"
 msgstr "_Messaggi"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Con _categoria"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Sca_denza:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Imposta _stato"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Attività"
 
@@ -18190,14 +18384,10 @@ msgstr "LMMGVSD"
 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 "Adesso"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Oggi"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18207,82 +18397,87 @@ msgstr "La data deve essere inserita nel formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltico"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Europeo centrale"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Cinese"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Cirillico"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Greco"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turco"
 
-#: 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 "Europeo occidentale"
 
-#: 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 "Europeo occidentale"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradizionale"
 
-#: 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 "Semplificato"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ucraino"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Visuale"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set di caratteri sconosciuto: %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 "Codifica dei caratteri"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Inserire il set di caratteri da usare"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Altro..."
 
@@ -18347,11 +18542,16 @@ msgid "Spacing around expander arrow"
 msgstr "Spaziatura attorno la freccia dell'espansore"
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Cerca"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Cerca editor"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Salva ricerca"
 
@@ -18372,15 +18572,15 @@ msgstr "_Avanzata..."
 msgid "Choose Image"
 msgstr "Scegli un file"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Cerca"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "Trova ora"
 
-#: 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 "Annulla"
 
@@ -18410,6 +18610,331 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Sorgenti della rubrica..."
+
+#~ msgid "Selected:"
+#~ msgstr "Selezionato:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 contatto"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "e %d altri contatti."
+
+#~ msgid "Send an Email"
+#~ msgstr "Invia una Email"
+
+#~ msgid "1 day"
+#~ msgstr "1 giorno"
+
+#~ msgid "1 week"
+#~ msgstr "1 settimana"
+
+#~ msgid "1 hour"
+#~ msgstr "1 ora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuto"
+
+#~ msgid "1 second"
+#~ msgstr "1 secondo"
+
+#~ msgid "Description"
+#~ msgstr "Descrizione"
+
+#~ msgid "component"
+#~ msgstr "Componente"
+
+#~ msgid "Alarms"
+#~ msgstr "Avvisi sonori"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Posizione geografica"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Ogni %d giorni"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Ogni %d settimane"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Ogni %d settimane il "
+
+#~ msgid "every %d months"
+#~ msgstr "ogni %d mesi"
+
+#~ msgid "Every %d years"
+#~ msgstr "Ogni %d anni"
+
+#~ msgid "Go To Date"
+#~ msgstr "Vai alla data"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Vai a oggi"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Nome server LDAP:"
+
+#~ msgid "Search base:"
+#~ msgstr "Base della ricerca:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "Richiesta STARTTLS scaduta: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "Errore nella risposta di STARTTLS"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "Richiesta HELO scaduta: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "Errore nella risposta di HELO"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "Richiesta AUTH scaduta: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "Richiesta AUTH non riuscita"
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "Errore nella risposta MAIL FROM"
+
+#~ msgid "DATA response error"
+#~ msgstr "Errore nella risposta di DATA"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %"
+#~ "s posta non inviata."
+
+#~ msgid "DATA termination response error"
+#~ msgstr "Errore di risposta di DATA"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "Richiesta RSET scaduta: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "Errore nella risposta di RSET"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "Richiesta QUIT scaduta: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "Errore nella risposta di QUIT"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d secondi fa"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minuti fa"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d ore fa"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d giorni fa"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d settimane fa"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d mesi fa"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d anni fa"
+
+#~ msgid "Then"
+#~ msgstr "Di"
+
+#~ msgid "If"
+#~ msgstr "Se"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Modifica filtri"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Modifica vfolder"
+
+#~ msgid "Outgoing"
+#~ msgstr "In uscita"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Manda messaggio in pipe ad un comando della shell"
+
+#~ msgid "Shell Command"
+#~ msgstr "Comando della shell"
+
+#~ msgid "Rules"
+#~ msgstr "Regole"
+
+#~ msgid "[script]"
+#~ msgstr "[script]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Aggiungi firma script"
+
+#~ msgid "Current store format:"
+#~ msgstr "Formato corrente:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Indice contenuto del corpo dei messaggi"
+
+#~ msgid "New store format:"
+#~ msgstr "Nuovo formato:"
+
+#~ 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 ""
+#~ "Attenzione: durante la conversione di formati di mailbox,\n"
+#~ "un errore (come una mancanza di spazio su disco) può non essere\n"
+#~ "recuperabile automaticamente.  Usare con cautela."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL non è supportato in questa compilazione di Evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Informazioni sull'account"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticazione"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Composizione messaggio"
+
+#~ msgid "Configuration"
+#~ msgstr "Configurazione"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Comportamento predefinito"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Cancellazione posta"
+
+#~ msgid "Filter Options"
+#~ msgstr "Opzioni filtri"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Etichette e colori"
+
+#~ msgid "Loading Images"
+#~ msgstr "Caricamento immagini"
+
+#~ msgid "Message Display"
+#~ msgstr "Visualizzazione messaggio"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Carattere del messaggio"
+
+#~ msgid "Optional Information"
+#~ msgstr "Informazioni opzionali"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Caratteri di stampa"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Ri_corda questa password"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Ricorda questa _password"
+
+#~ msgid "Required Information"
+#~ msgstr "Informazioni richieste"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Ripristina predefiniti"
+
+#~ msgid "S_ecurity"
+#~ msgstr "Sicur_ezza"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME sicuro (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Configurazione del server"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "Tipo di _autenticazione: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "Tipo di _autenticazione: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "Firma pre_definita:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Nome e cognome:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identità"
+
+#~ msgid "_Junk"
+#~ msgstr "Da _cestinare"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Ricezione posta"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Ripristina predefiniti"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Spedizione posta"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Invio di \"%s\" in corso"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Errore al messaggio %d di %d"
+
+#~ msgid "Changing junk status"
+#~ msgstr "Cambio stato da cestinare"
+
+#~ msgid "Search"
+#~ msgstr "Cerca"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Firma digitale"
+
+#~ msgid "Encryption"
+#~ msgstr "Cifratura"
+
+#~ msgid "Quit Assistant"
+#~ msgstr "Esci dall'assistente"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "In questo momento sono attive le seguenti connessioni:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Cerca contatti"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Vai alla _data"
+
+#~ msgid "Go to today"
+#~ msgstr "Vai a oggi"
+
+#~ msgid "With _Category"
+#~ msgstr "Con _categoria"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Sorgenti della rubrica"
 
@@ -18462,9 +18987,6 @@ msgstr "%s (%d%% completata)"
 #~ msgid "Scanning directory"
 #~ msgstr "Scansione cartella"
 
-#~ msgid "    "
-#~ msgstr "    "
-
 #~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
 #~ msgstr "_Non controllare la nuova posta in ingresso per account IMAP"
 
diff --git a/po/ja.po b/po/ja.po
index d027e69876..57fa9faf33 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,14 +8,55 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-23 11:36+0900\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-23 11:36+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \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 アドレス帳"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "ローカルのアドレス帳フォルダの一覧"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "別名で保存"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "カード"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "カード"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "連絡先: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution アラーム"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -47,7 +88,6 @@ msgstr "ここで自動補完を設定します"
 #. 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
@@ -95,75 +135,91 @@ msgstr "この S/MIME 証明書のマネージャ"
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "アドレス帳 '%s' を削除します。本当に続行してもよろしいですか？"
 
-#: 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 "新しいアドレス帳"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "削除"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "新しい連絡先"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "新しい連絡先一覧"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "新しい連絡先一覧を作成します"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "新しいアドレス帳"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "アドレス帳"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "新しいタスクを作成します"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP サーバへ接続できませんでした"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP サーバを使った認証に失敗しました"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "ルート 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 "サーバがサポートしていない検索ベースを返しました"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "このサーバは LDAPv3 スキーマ情報をサポートしていません"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "スキーマ情報の取得でエラーが発生しました"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "サーバは正しいスキーマ情報で応答しません"
 
@@ -191,20 +247,18 @@ msgid "Migrating `%s':"
 msgstr "'%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
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
 #: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "このコンピュータ"
 
 #. Create the default Person addressbook
-#. 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 "プライベート"
 
@@ -257,7 +311,7 @@ msgstr "このアドレス帳のバックエンドは、この問い合わせの
 msgid "This query did not complete successfully."
 msgstr "この問い合わせは完全に終了しませんでした。"
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -265,7 +319,7 @@ msgstr ""
 "このアドレス帳を開けませんでした。パスの存在とアクセス権をチェックして下さ"
 "い。"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -273,7 +327,7 @@ msgstr ""
 "このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
 "サーバがダウンしていることをを意味します。"
 
-#: 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 "
@@ -283,7 +337,7 @@ msgstr ""
 "Evolution で LDAP を利用するには、下記のリンクから OpenLDAP を取得した後、"
 "CVS 版のソースを再ビルド・インストールする必要があります。"
 
-#: 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."
@@ -291,28 +345,28 @@ msgstr ""
 "このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
 "がダウンしていることを意味します。"
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開けません"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名で LDAP サーバにアクセスします"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "認証に失敗しました。\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s (ユーザ %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 が表示されます"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "アドレス帳が表示する URI"
 
@@ -335,16 +389,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "名前選択ダイアログで使用する最後のフォルダの URI"
 
 #: 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 " サポートしている検索ベースの表示(_H) "
 
-#: 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
@@ -359,59 +407,51 @@ msgstr " サポートしている検索ベースの表示(_H) "
 #: 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 "398"
 
-#: 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 "アドレス帳の作成アシスタント"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "アドレス帳のソース"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "常に"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "匿名"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -423,51 +463,51 @@ msgstr ""
 "\n"
 "[適用] ボタンをクリックして、ここで入力した設定を保存して下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "接続"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "識別名(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "E-メール・アドレス:"
 
-#: 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 はこの DN (識別名) を使ってサーバの認証を行います"
 
-#: 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 はこの E-メール・アドレスを使ってサーバを利用した認証を行います"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "完了しました"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "全般"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "グループ:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "しない"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -483,23 +523,19 @@ msgstr ""
 "LDAP サーバが使用しているプロトコルについては、システム管理者に連絡して下さ"
 "い。"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "レベル１"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "検索範囲(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "検索"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "選択済:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -509,7 +545,7 @@ msgstr ""
 "る場合にのみ、\n"
 "Evolution は LDAP サーバに接続します。"
 
-#: 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"
@@ -525,7 +561,7 @@ msgstr ""
 "ファイヤーウォールの内側にある場合、Evolution は SSL/TLS を使いません。\n"
 "その理由は、既にセキュリティ保護された接続環境にあるからです。"
 
-#: 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"
@@ -539,7 +575,7 @@ msgstr ""
 "ティの恩恵を\n"
 "受けることができなくなることを意味します。"
 
-#: 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 "
@@ -549,7 +585,7 @@ msgstr ""
 "このオプションを有効にすると、Evolution の LDAP 検索や\n"
 "連絡先の生成や編集の初期値を変更できます。"
 
-#: 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"
@@ -559,32 +595,32 @@ msgstr ""
 "\t\t\t  最初のステップとして、\n"
 "\t\t\t  表示名とグループを指定して下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "ステップ１: フォルダの種類"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "ステップ２: サーバの情報"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "ステップ３: サーバへの接続"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "ステップ４: ディレクトリの検索"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "サブ・ディレクトリ"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "サポートする検索ベース"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -597,7 +633,7 @@ msgstr ""
 "また検索時間をどれくらいにするかを設定します。\n"
 "これらのオプションを変更する必要がある場合は、システム管理者にお尋ね下さい。"
 
-#: 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"
@@ -607,7 +643,7 @@ msgstr ""
 "検索ベースとは、検索を開始するエントリの識別名 (DN) です。\n"
 "空白のままにすると、ディレクトリ・ツリーのルートから検索を開始します。"
 
-#: 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"
@@ -622,7 +658,7 @@ msgstr ""
 "す。\n"
 "検索範囲 \"レベル１\" には検索ベースの第一レベルのエントリのみ含まれます。\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"
@@ -638,14 +674,14 @@ msgstr ""
 "追加すべき情報が必要になるかもしれません。\n"
 "それらの情報が不明な場合は、システム管理者に連絡して下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "これはお使いの LDAP サーバのフルパス名です。(例: \"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"
@@ -654,7 +690,7 @@ msgstr ""
 "これはダウンロードするエントリの最大数です。\n"
 "この数を大きくすると、アドレス帳を開く速度が遅くなります。"
 
-#: 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 "
@@ -663,7 +699,7 @@ msgstr ""
 "これは Evolution があなたを識別する方法です。\"E-メール・アドレス\" に対する"
 "この設定には、LDAP サーバに対する匿名アクセスが必要となります。"
 
-#: 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"
@@ -672,7 +708,7 @@ msgstr ""
 "これはこのサーバの名前で、Evolution フォルダ一覧の中に表示されます。\n"
 "表示目的にのみ使用されます。"
 
-#: 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 "
@@ -680,7 +716,7 @@ msgid ""
 msgstr ""
 "これは Evolution フォルダの中に表示される名前で、表示目的にのみ使用されます。"
 
-#: 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"
@@ -691,28 +727,28 @@ msgstr ""
 "標準ポートの一覧が提供されています。\n"
 "特別に指定する必要がある場合は、システム管理者にお尋ね下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr "このオプションは検索にかかる処理時間を指定します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS を使用する(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "使用する識別名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -723,60 +759,48 @@ msgstr ""
 "アカウント名とログイン情報を提供して下さい。\n"
 "これらの情報が不明な場合は、システム管理者に問い合わせて下さい。"
 
-#: 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 "表示名(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: 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:17
-#: 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 "編集(_E)"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "ログイン方式(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "ポート番号(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "検索ベース(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "サーバ名(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "タイムアウト(分)(_T):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "カード"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "接続タブ"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "全般タブ"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "検索タブ"
 
@@ -808,7 +832,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML メールを送信しますか？"
 
 #: 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 "連絡先へ追加"
 
@@ -824,7 +848,7 @@ msgstr "名前"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "情報ソース"
 
@@ -891,7 +915,8 @@ msgstr "コラボレーション"
 
 #. 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 "連絡先エディタ"
 
@@ -900,7 +925,7 @@ msgid "D_epartment:"
 msgstr "担当部署(_E):"
 
 #: 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 "詳細"
@@ -984,16 +1009,27 @@ msgstr "カテゴリ(_C)..."
 
 #. 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-calendar-view.c:1332
-#: calendar/gui/e-calendar-view.c:1363 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2504
-#: mail/em-folder-view.c:765 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 "削除(_D)"
 
+#: 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 "編集(_E)"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "自宅(_H):"
@@ -1043,9 +1079,9 @@ msgstr "住所"
 #: 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
@@ -2031,7 +2067,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"
@@ -2046,20 +2082,21 @@ msgid "MSN Messenger"
 msgstr "MSN メッセンジャ"
 
 #: 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 "サービス"
 
 #: 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 "場所"
 
@@ -2068,111 +2105,95 @@ msgid "Username"
 msgstr "ユーザ名"
 
 #: 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 "自宅"
 
 #. 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 "仕事"
 
 #: 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 "その他"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "元のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "対象のアドレス帳"
 
-#: 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:180
 msgid "Contact"
 msgstr "連絡先"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "新しい連絡先です"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "書き込み可能な項目"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "変更済"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "アカウント名"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "カテゴリ・エディタが起動していません。"
 
-#: 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 "この連絡先が属しているカテゴリ:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "vCard 形式で連絡先の保存"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "仕事"
 
-#: 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 "フィールドのウィジットが見つかりませんでした: '%s'"
@@ -2186,6 +2207,7 @@ msgid "_Edit Full"
 msgstr "全て編集(_E)"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "氏名(_F):"
 
@@ -2193,6 +2215,22 @@ msgstr "氏名(_F):"
 msgid "E-_mail:"
 msgstr "E-メール(_M):"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "住所２(_2):"
@@ -2310,6 +2348,10 @@ msgstr "IM サービス(_I):"
 msgid "_Location:"
 msgstr "場所(_L):"
 
+#: 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 "メンバー"
@@ -2331,25 +2373,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr "連絡先一覧エディタ"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "書籍"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "新しい一覧です"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr "連絡先一覧エディタ"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "一覧を vCard で保存"
 
@@ -2401,23 +2444,21 @@ msgid "No contacts"
 msgstr "連絡先なし"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "連絡先 1個"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "連絡先 %d個"
+msgstr[1] "連絡先 %d個"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "連絡先 %d個"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "問い合わせ"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "ブックビューの取得でエラーが発生しました"
 
@@ -2429,127 +2470,128 @@ msgstr "モデル"
 msgid "Error modifying card"
 msgstr "カードの修正中にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "名前が次のもので始まる"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "E-メールが次のもので始まる"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "カテゴリが次のものを含む"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "項目が次のものを含む"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "拡張..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-list-view.c:340
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "種類"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:497
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-#: addressbook/gui/widgets/e-addressbook-view.c:2019
+#: 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 "vCard 形式で保存"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "新しい連絡先..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "新しい連絡先一覧..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "フォルダへ移動..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "インポート..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "連絡先の検索..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "アドレス帳のソース..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "パイロットの設定..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "この連絡先の転送"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "この連絡先へメッセージの送信"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064 calendar/gui/print.c:2480
-#: 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 "印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "宛名の印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "アドレス帳へコピー..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "アドレス帳へ移動..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "切り取り"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:372 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "コピー"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1076
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼り付け"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "現在の表示"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1270
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2561,7 +2603,7 @@ msgstr ""
 "再度利用する場合は Evolution を再起動して下さい。"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "任意のカテゴリ"
@@ -2595,8 +2637,6 @@ msgid "Car Phone"
 msgstr "車載電話"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -2700,7 +2740,7 @@ msgstr "ラジオ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:347
+#: calendar/gui/e-meeting-list-view.c:256
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "役割"
@@ -2866,11 +2906,11 @@ msgstr "職業"
 msgid "Home page"
 msgstr "ホームページ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "成功"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2878,27 +2918,27 @@ msgstr "成功"
 msgid "Unknown error"
 msgstr "未知のエラー"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "オフライン・リポジトリ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "連絡先が見つかりません"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "既に連絡先 ID があります"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "プロトコルがサポートされていません"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
@@ -2909,61 +2949,61 @@ msgstr "プロトコルがサポートされていません"
 msgid "Cancelled"
 msgstr "キャンセル済み"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "認証に失敗しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "認証を必要としています"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS は無効です"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "アドレス帳がありません"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "その他のエラー"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "変更を保存しますか？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "破棄(_D)"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "一覧を追加する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "連絡先を追加する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "一覧を修正する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "連絡先を修正する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "一覧を削除する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "連絡先を削除する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2972,7 +3012,7 @@ msgstr ""
 "%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
 "本当に全ての連絡先を表示してもよろしいですか？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2981,49 +3021,49 @@ msgstr ""
 "既に %s があります。\n"
 "上書きしてもよろしいですか？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "上書き"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "%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 "一覧"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "連絡先の移動先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "連絡先のコピー先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "複数の連絡先の移動先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "複数の連絡先のコピー先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr "アドレス帳の選択"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "複数の vCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s の vCard"
@@ -3059,33 +3099,31 @@ msgstr "既存の連絡先 \"%s\" へのアドレスの追加"
 msgid "Querying Address Book..."
 msgstr "アドレス帳の問い合わせ中..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "連絡先情報の編集"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "E-メール・アドレスの結合"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "と他に %d 個の連絡先。"
-
-#: 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 "と他に 1 個の連絡先。"
+msgid_plural "and %d other contacts."
+msgstr[0] "と他に 1 個の連絡先。"
+msgstr[1] "と他に 1 個の連絡先。"
 
-#: 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 "全ての vCard の表示"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "コンパクト vCard の表示"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "アドレス帳に保存"
 
@@ -3097,17 +3135,17 @@ msgstr "カード表示"
 msgid "GTK Tree View"
 msgstr "GTK+ ツリー表示"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow のテスト"
 
-#: 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 "キャンバスのアイテムを Reflow するどうかをテストします"
 
@@ -3233,7 +3271,7 @@ msgstr "マージン"
 msgid "Number of columns:"
 msgstr "列数:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "オプション"
 
@@ -3412,7 +3450,7 @@ msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "パスワードの入力"
 
@@ -3489,7 +3527,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution タスクのコンポーネント"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1138 calendar/gui/print.c:1819
+#: 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"
@@ -3565,12 +3603,12 @@ msgstr ""
 "起動: %s\n"
 "終了: %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
-#: calendar/gui/alarm-notify/alarm-queue.c:1109
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: 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"
@@ -3582,7 +3620,7 @@ msgstr ""
 "の設定がされていました。その代わりに Evolution は\n"
 "通常のリマインダ・ダイアログを表示します。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1115
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3599,7 +3637,7 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
@@ -3767,9 +3805,9 @@ msgstr "場所が次のものを含む"
 msgid "Unmatched"
 msgstr "一致しない"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1585
-#: 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 "カレンダ"
 
@@ -3787,7 +3825,7 @@ msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "日"
 
@@ -3797,12 +3835,8 @@ msgstr "%Y年 %B %e日 %A"
 
 #. 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:1589 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 "%m/%d (%a)"
 
@@ -3824,70 +3858,70 @@ msgstr "%Y年 %B %e日"
 msgid "%d %B"
 msgstr "%B%e日"
 
-#: 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 "カレンダ '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "終日の予定(_D)"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "カレンダ(_A)"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "イベントと会議を生成するためのカレンダ '%s' を開けません"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議を生成するために利用可能なカレンダがありません"
 
@@ -3917,10 +3951,6 @@ msgstr "週間表示"
 msgid "Month View"
 msgstr "月間表示"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "一覧表示"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "カレンダをオープンする際にエラーが発生しました"
@@ -3938,16 +3968,16 @@ msgstr "カレンダをオープンする権限がありません"
 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 "'%s' にあるフォルダを開けませんでした"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "カレンダが表示する URI"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "表示するビューの種類"
 
@@ -4011,11 +4041,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "回 / "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "時間"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "分"
 
@@ -4038,11 +4068,11 @@ msgstr "基本"
 msgid "Date/Time:"
 msgstr "日付/時刻:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "メッセージを表示する"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "音楽を再生する"
 
@@ -4050,17 +4080,17 @@ msgstr "音楽を再生する"
 msgid "Reminders"
 msgstr "リマインダ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "プログラムを実行する"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 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 "E-メールを送信する"
 
 #: 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 "サマリ:"
@@ -4091,7 +4121,7 @@ msgid "hour(s)"
 msgstr "時間"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "分"
 
@@ -4101,8 +4131,8 @@ msgstr "予定を開始した時"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:493
-#: 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 "有効"
 
@@ -4116,19 +4146,19 @@ msgstr "削除しない"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c: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:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "無効"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:401
-#: 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 "有効"
 
@@ -4152,7 +4182,7 @@ msgstr "30 分"
 msgid "60 minutes"
 msgstr "60 分"
 
-#: 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 "警告"
 
@@ -4177,7 +4207,7 @@ msgid "Days"
 msgstr "日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "有効(_N)"
 
@@ -4272,7 +4302,7 @@ msgid "Wednesday"
 msgstr "水曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "平日"
 
@@ -4317,7 +4347,6 @@ msgid "_Fri"
 msgstr "金(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "全般(_G)"
 
@@ -4412,7 +4441,7 @@ msgstr ""
 "[適用] ボタンをクリックして、ここで入力した設定を保存して下さい。"
 
 #: 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 "新しいタスク一覧"
 
@@ -4623,8 +4652,9 @@ msgstr "ジャーナル・エントリ - %s"
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-calendar-view.c:1057
-#: 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 "別名で保存..."
 
@@ -4638,15 +4668,15 @@ msgstr "更新が届いたらこのアイテムに対する変更を破棄する
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:58
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "送信元ソースを開けませんでした"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:66
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "転送先ソースを開けませんでした"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:75
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "転送先は読み込み専用"
 
@@ -4678,19 +4708,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "本当にタイトルなしの仕訳記入を削除してもよろしいですか？"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "本当に %d 個の予定を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "本当に %d 個のタスクを削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "本当に %d 個の仕訳記入を削除してもよろしいですか？"
+#, 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] "本当に %d 個の予定を削除してもよろしいですか？"
+msgstr[1] "本当に %d 個の予定を削除してもよろしいですか？"
+
+#: 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] "本当に %d 個のタスクを削除してもよろしいですか？"
+msgstr[1] "本当に %d 個のタスクを削除してもよろしいですか？"
+
+#: 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] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
+msgstr[1] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4824,8 +4860,6 @@ msgstr "カレンダ:"
 
 #: 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 "区分"
 
@@ -4874,17 +4908,12 @@ msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
 #. 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:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1310 mail/mail-account-gui.c:1838
-#: 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:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4908,7 +4937,7 @@ msgid "_Delegate To..."
 msgstr "委任先(_D)..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:331
+#: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "出席者"
@@ -4944,14 +4973,14 @@ msgid "Member"
 msgstr "メンバー"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:354
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "返信の有無"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-list-view.c:361
+#: 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
 msgid "Status"
@@ -5121,7 +5150,7 @@ msgid "_No recurrence"
 msgstr "繰り返さない(_N)"
 
 #: 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 "削除(_R)"
 
@@ -5163,7 +5192,7 @@ msgstr ""
 "\n"
 "その変更を保存しますか？"
 
-#: 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 "変更の破棄(_D)"
 
@@ -5171,6 +5200,28 @@ msgstr "変更の破棄(_D)"
 msgid "Save Event"
 msgstr "イベントの保存"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "インポーターの選択"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "送信先を指定します"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "カレンダ"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "新しいタスク一覧"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "会議の情報が生成されました。この召集通知を送信しますか？"
@@ -5206,7 +5257,7 @@ msgstr "完了"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr "高い"
 
@@ -5219,13 +5270,13 @@ msgstr "進行中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "低い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:864 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 "普通"
 
@@ -5289,9 +5340,9 @@ msgstr "'%s' のタスクを開けません。"
 msgid "Con_fidential"
 msgstr "極秘(_F)"
 
-#: 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 "説明:"
 
@@ -5356,131 +5407,113 @@ msgid "Weekly"
 msgstr "毎週"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d 日間"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 日"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d 週間"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 週間"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d 時間"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 時間"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d 分"
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 分"
-
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 秒"
-
-#: calendar/gui/e-alarm-list.c:477
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 日間"
+msgstr[1] "%d 日間"
+
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d 週間"
+msgstr[1] "%d 週間"
+
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 時間"
+msgstr[1] "%d 時間"
+
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
+msgstr[1] "%d 分"
+
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+msgstr[1] "%d 秒"
+
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "実行するアクションが不明です"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s は予定が開始する前に %s"
 
-#: 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"
 
-#: 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"
 
-#: 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"
 
-#: 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"
 
-#: 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"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s (%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"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:312
-#: calendar/gui/e-cal-model.c:319 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "公開"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:321
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "非公開"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:323
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "極秘"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "説明"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "日付"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "開始日"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "サマリ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "色"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "コンポーネント"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "予定なし"
@@ -5516,149 +5549,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:259 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "はい"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:260 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "いいえ"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:325 calendar/gui/e-cal-model.c:328
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-list-view.c:249 calendar/gui/e-meeting-store.c:115
+#: 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:2130
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "未知"
 
-#: calendar/gui/e-cal-model.c:866
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "繰り返し"
 
-#: calendar/gui/e-cal-model.c:868
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: calendar/gui/e-calendar-view.c:677 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "指定したオブジェクトを削除します"
-
-#: calendar/gui/e-calendar-view.c:778 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "オブジェクトの更新"
-
-#: calendar/gui/e-calendar-view.c:1284 calendar/gui/e-calendar-view.c:1371
-msgid "New _Appointment..."
-msgstr "新しい予定(_A)..."
-
-#: calendar/gui/e-calendar-view.c:1285 calendar/gui/e-calendar-view.c:1373
-msgid "New All Day _Event"
-msgstr "新しい終日のイベント(_E)"
-
-#: calendar/gui/e-calendar-view.c:1286 calendar/gui/e-calendar-view.c:1375
-msgid "New Meeting"
-msgstr "新しい会議"
-
-#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1377
-msgid "New Task"
-msgstr "新しいタスク"
-
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-view.c:1383 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 "印刷(_P)..."
-
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1321
-#: calendar/gui/e-calendar-view.c:1381 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 "貼り付け(_P)"
-
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1367
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "今日へ移動(_T)"
-
-#: calendar/gui/e-calendar-view.c:1302 calendar/gui/e-calendar-view.c:1369
-msgid "_Go to Date..."
-msgstr "指定日へ移動(_G)..."
-
-#: calendar/gui/e-calendar-view.c:1306 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "予定の有無の公開(_P)"
-
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "開く(_O)"
-
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1385
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: 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 "別名で保存(_S)..."
-
-#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1361
-#: 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 "切り取り(_U)"
-
-#: calendar/gui/e-calendar-view.c:1320 calendar/gui/e-calendar-view.c:1359
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2497 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 "コピー(_C)"
-
-#: calendar/gui/e-calendar-view.c:1325
-msgid "Cop_y to Calendar..."
-msgstr "カレンダへコピー(_Y)..."
-
-#: calendar/gui/e-calendar-view.c:1326
-msgid "Mo_ve to Calendar..."
-msgstr "カレンダへ移動(_V)..."
-
-#: calendar/gui/e-calendar-view.c:1327
-msgid "_Schedule Meeting..."
-msgstr "会議のスケジュール(_S)..."
-
-#: calendar/gui/e-calendar-view.c:1328
-msgid "_Forward as iCalendar..."
-msgstr "iCalender 形式で転送(_F)..."
-
-#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1364
-msgid "Delete this _Occurrence"
-msgstr "このイベントの削除(_O)"
-
-#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1365
-msgid "Delete _All Occurrences"
-msgstr "全てのイベントの削除(_A)"
-
-#: calendar/gui/e-calendar-view.c:1387 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "設定(_S)..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5703,32 +5626,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 "指定したオブジェクトを削除します"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "オブジェクトの更新"
+
+#: 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 "開く(_O)"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "ウェブ・ページを開く(_W)"
 
-#: 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 "別名で保存(_S)..."
+
+#: 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 "印刷(_P)..."
+
+#: 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 "切り取り(_U)"
+
+#: 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 "コピー(_C)"
+
+#: 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 "貼り付け(_P)"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "タスクの割当て(_A)"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "iCalender 形式で転送(_F)"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "完了としてマーク(_M)"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "選択したタスクに完了マークを付与(_M)"
 
-#: 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 "指定したタスクの削除(_D)"
 
-#: 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 "<ここをクリックしてタスクを追加して下さい>"
 
@@ -5737,58 +5713,104 @@ msgstr "<ここをクリックしてタスクを追加して下さい>"
 msgid "% Complete"
 msgstr "完了 (%)"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "アラーム"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "完了しました"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "完了日"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Due date"
 msgstr "期日"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical position"
-msgstr "緯度経度"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "優先度"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Start date"
 msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "タスクの並び替え"
 
-#: 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 "新しい予定(_A)..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "新しい終日のイベント(_E)"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "新しい会議"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "新しいタスク"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "スレッドで選択(_T)"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "選択(_S)..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "予定の有無の公開(_P)"
+
+#: calendar/gui/e-calendar-view.c:1274
+msgid "Cop_y to Calendar..."
+msgstr "カレンダへコピー(_Y)..."
+
+#: calendar/gui/e-calendar-view.c:1275
+msgid "Mo_ve to Calendar..."
+msgstr "カレンダへ移動(_V)..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "会議のスケジュール(_S)..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "iCalender 形式で転送(_F)..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "このイベントの削除(_O)"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "全てのイベントの削除(_A)"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "今日へ移動(_T)"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "指定日へ移動(_G)..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "設定(_S)..."
 
 #. 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 "%Y/%m/%d (%a) %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"
@@ -5812,33 +5834,26 @@ msgstr "%02i 分分割"
 
 #. 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:1572
+#: 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 "%B%e日 %A"
 
 #. 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:1605
+#: 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 "%B%e日"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:822 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:825 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "午後"
@@ -5847,106 +5862,98 @@ msgstr "午後"
 msgid "Yes. (Complex Recurrence)"
 msgstr "はい (複合的な繰り返し)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "毎日"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "%d 日毎"
+msgid_plural "Every %d days"
+msgstr[0] "毎日"
+msgstr[1] "毎日"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "毎週"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "%d 週間毎"
+msgid_plural "Every %d weeks"
+msgstr[0] "毎週"
+msgstr[1] "毎週"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "次の毎週 "
+msgid_plural "Every %d weeks on "
+msgstr[0] "次の毎週 "
+msgstr[1] "次の毎週 "
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "次の %d 週間毎 "
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " と "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "次の %s 日 "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "次の %s %s "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "毎月"
+msgid_plural "every %d months"
+msgstr[0] "毎月"
+msgstr[1] "毎月"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "%d 月毎"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "毎年"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "%d 年毎"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " %d 回の合計"
-
-#: calendar/gui/e-itip-control.c:685
+msgid_plural "Every %d years"
+msgstr[0] "毎年"
+msgstr[1] "毎年"
+
+#: 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] " %d 回の合計"
+msgstr[1] " %d 回の合計"
+
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", 次の終わり "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>開始日:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>終了日:<b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>完了日:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>期日:</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 情報"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar エラー"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "身元不明な人"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5954,314 +5961,314 @@ msgstr ""
 "<br> 次の情報を再表示して下さい。それから下にあるメニューから行動を選択して下"
 "さい。"
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>なし</i>"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "場所:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "ステータス:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:271
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "受諾済"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "暫定的に受諾済"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:272
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "辞退済"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "アクションの選択:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "更新"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "受諾"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "暫定的に受諾"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "辞退"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "予定の有無の送信"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "応答者ステータスの更新"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "最新情報の送信"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> さんが会議の情報を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "会議の情報"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> さんが %s の会議への出席を要求してきました。"
 
-#: 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> さんが貴方の会議への出席を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "会議の提案"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> さんは既存の会議への参加を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "会議の更新"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> さんは会議の最新情報を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "会議の更新要求"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> さんが会議開催要求に対して返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "会議への返信"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> さんが会議をキャンセルしました。"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "会議のキャンセル"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> さんが意味不明なメッセージを送信してきました。"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "おかしな会議メッセージ"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> さんがタスク情報を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "タスク情報"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> さんが %s のタスクを実行に移すよう要求してきました。"
 
-#: 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> さんがタスクを実行に移すよう要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "タスクの提案"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> さんは既存のタスクへの追加を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "タスクの更新"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> さんはタスクの最新情報を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "タスクの更新要求"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> さんはタスクの割り当てに対して返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "タスクへの返信"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> さんはタスクをキャンセルしました。"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "タスクの取り消し"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "おかしなタスクメッセージ"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> さんが予定を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "予定の有無"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> さんが予定を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "予定の有無の要求"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "予定の有無の要求に対して <b>%s</s> さんが返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "予定の有無の返信"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "予定の有無のメッセージが間違っています"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "メッセージが正しい形式になっていません"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "メッセージの中に未サポートの要求だけあります。"
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "添付した内容に含まれるカレンダ・メッセージは正しくありません"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "添付した内容には表示可能なカレンダ情報がありません"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "カレンダ・ファイルを更新できません！\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "更新が完了しました\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 "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: 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 "オブジェクトが不正なので更新できません\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 "これは現在の出席者からの応答ではありません。出席者として追加しますか？"
 
-#: 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 "不正なステータスのため出席状況が更新できませんでした！\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 "CORBA システムでエラーが見つかりました\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "オブジェクトが見つかりませんでした\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 "カレンダを更新する権限がありません\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "出席状況が更新されました\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "出席状況を更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "削除が完了しました"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "アイテムが送信されました！\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 "そのアイテムは送信できませんでした！\n"
 
@@ -6307,7 +6314,7 @@ msgid "Chair Persons"
 msgstr "議長"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:570
+#: calendar/gui/e-meeting-list-view.c:479
 msgid "Required Participants"
 msgstr "必須の参加者"
 
@@ -6319,57 +6326,57 @@ msgstr "任意の参加者"
 msgid "Resources"
 msgstr "リソース"
 
-#: calendar/gui/e-meeting-list-view.c:231 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "個人"
 
-#: calendar/gui/e-meeting-list-view.c:232 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "グループ"
 
-#: calendar/gui/e-meeting-list-view.c:233 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "リソース"
 
-#: calendar/gui/e-meeting-list-view.c:234 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "ルーム"
 
-#: calendar/gui/e-meeting-list-view.c:245 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "議長"
 
-#: calendar/gui/e-meeting-list-view.c:246 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "必須の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:247 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "任意の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:248 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "不参加者"
 
-#: calendar/gui/e-meeting-list-view.c:270 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "要アクション"
 
-#: calendar/gui/e-meeting-list-view.c:273 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "暫定"
 
-#: calendar/gui/e-meeting-list-view.c:274 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "委任済"
@@ -6387,10 +6394,6 @@ msgstr "%Y年 %B %e日 %A"
 
 #. 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
@@ -6399,10 +6402,6 @@ msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6486,12 +6485,12 @@ msgstr "優先度:"
 msgid "Web Page:"
 msgstr "ウェブ・ページ"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1903
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6501,7 +6500,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:792 calendar/gui/gnome-cal.c:1924
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6538,37 +6537,42 @@ msgstr "タスクの完了..."
 msgid "Deleting selected objects..."
 msgstr "指定したオブジェクトの削除..."
 
-#: calendar/gui/e-tasks.c:1062
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "抹消"
 
-#: calendar/gui/gnome-cal.c:1738
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "%s のタスクの読み込み"
-
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s の予定の読み込み"
 
-#: calendar/gui/gnome-cal.c:1783
+#: calendar/gui/gnome-cal.c:1779
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "%s のタスクの読み込み"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "%s を開く"
 
-#: calendar/gui/gnome-cal.c:1932
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 "%s\n"
 "用のカレンダ・バックエンドが\n"
 "クラッシュしました。"
 
-#: calendar/gui/gnome-cal.c:2776
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"%s\n"
+"用のタスク・バックエンドが\n"
+"クラッシュしました。"
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "抹消中"
 
@@ -6589,44 +6593,46 @@ msgid "February"
 msgstr "2 月"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "指定日へ移動"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "1 月"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "7 月"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "6 月"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "3 月"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "5 月"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "11 月"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "10 月"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "全てのテキストを選択します"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "9 月"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "今日へ移動(_G)"
+#, fuzzy
+msgid "_Select Today"
+msgstr "フォルダの選択"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6716,7 +6722,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "誕生日と記念日"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "ウェブ"
 
@@ -6956,36 +6962,36 @@ msgstr "プリンタの設定"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "タスク一覧 '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "新規のタスク"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "新しいタスク一覧"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "タスク一覧(_T)"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "新しいタスク一覧を作成します"
 
-#: 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 "イベントと会議の作成に必要なタスク一覧 '%s' を開けません"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
@@ -8845,7 +8851,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
@@ -9225,7 +9231,7 @@ msgstr "参照している証明書の期限が過ぎています。"
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1193
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました。"
 
@@ -9419,29 +9425,30 @@ msgstr "処理エラー"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "署名者: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "フォルダを取得できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:242
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/camel-store.c:293
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "フォルダを作成できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:377 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 "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:773 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35 mail/mail-ops.c:1083
+#: 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"
@@ -9715,31 +9722,32 @@ msgstr "このサーバの Inbox にある新しいメッセージへフィル�
 msgid "Automatically synchronize remote mail locally"
 msgstr "リモートとローカルのメールを自動的に同期する"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP サーバ名:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "アドレス帳"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "検索ベース:"
+#: 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 "Novell Groupwise サーバ・アクセス用です"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "パスワード"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9747,20 +9755,20 @@ msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って IMAP サーバに接続しま"
 "す"
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
 msgstr "チェックリスト"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2860
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "操作はキャンセルされました"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2863
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "突然サーバが接続を切りました: %s"
@@ -9818,12 +9826,12 @@ msgstr "フォルダは破壊され再作成されました"
 msgid "Scanning for changed messages"
 msgstr "変更メッセージの解析中"
 
-#: camel/providers/imap/camel-imap-folder.c:1926
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "メッセージを取得できません: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: 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
@@ -9839,25 +9847,25 @@ msgstr ""
 "メッセージを取得できません: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: camel/providers/imap/camel-imap-folder.c:1995
-#: camel/providers/imap/camel-imap-folder.c:2591
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "現在このメッセージは有効ではありません"
 
-#: camel/providers/imap/camel-imap-folder.c:2255
-#: camel/providers/imap/camel-imap-folder.c:2325
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "新規メッセージのサマリ情報の同期中"
 
-#: camel/providers/imap/camel-imap-folder.c:2629
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体がありませんでした。"
 
@@ -9928,18 +9936,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP サーバ %s"
 
-#: camel/providers/imap/camel-imap-store.c:427
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s の %s にある IMAP サービス"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
+#: 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
@@ -9949,14 +9957,14 @@ msgstr "%s の %s にある IMAP サービス"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続できませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: 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 は無効です"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:796
+#: 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
@@ -9964,50 +9972,50 @@ msgstr "SSL は無効です"
 msgid "Connection cancelled"
 msgstr "接続をキャンセルしました"
 
-#: camel/providers/imap/camel-imap-store.c:630
-#: camel/providers/imap/camel-imap-store.c:661
+#: 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 ""
 "セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-store.c:631
+#: 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 拡張がサポートされていません。"
 
-#: camel/providers/imap/camel-imap-store.c:662
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 接続に失敗しました"
 
-#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imap/camel-imap-store.c:803
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "コマンド \"%s\" で接続できませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1223
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1233
+#: 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 "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1256
+#: 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 "%s %s@%s の IMAP パスワードを入力して下さい"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:1299
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10018,13 +10026,20 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1717
-#: camel/providers/imap/camel-imap-store.c:1798
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/imap/camel-imap-store.c:1739
+#: 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 "フォルダ名 \"%s\" に文字 \"%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
@@ -10032,18 +10047,12 @@ msgstr "そのようなフォルダ %s はありません"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/providers/imap/camel-imap-store.c:1999
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
-
-#: camel/providers/imap/camel-imap-store.c:2011
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知の親フォルダ: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2047
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "親フォルダには複数のサブフォルダを含めることはできません"
 
@@ -10079,20 +10088,20 @@ msgid "Index message body data"
 msgstr "メッセージ本体のデータの目録を作成する"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: 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:392
-#: camel/providers/local/camel-local-folder.c:395
+#: 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:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10275,21 +10284,21 @@ msgstr "maildir 形式のフォルダではありません"
 msgid "Could not scan folder `%s': %s"
 msgstr "フォルダ '%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 "maildir フォルダのパスを開けませんでした: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "フォルダの整合性のチェック中"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "新しいメッセージのチェック"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10434,7 +10443,7 @@ msgstr "元のフォルダ %s を閉じることができませんでした: %s"
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることができませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダ名を変更できませんでした: %s"
@@ -10857,7 +10866,7 @@ msgstr "%s 日後に削除する"
 msgid "Disable support for all POP3 extensions"
 msgstr "全ての POP3 拡張サポートを無効にする"
 
-#: 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"
 
@@ -10946,7 +10955,7 @@ msgid "No such folder `%s'."
 msgstr "そのようなフォルダ '%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"
 
@@ -10999,12 +11008,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: 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 "SMTP を使ってリモートのメールハブに接続することでメールを配信します\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11269,44 +11279,44 @@ msgstr "QUIT コマンドが失敗しました"
 msgid "QUIT command failed"
 msgstr "QUIT コマンドが失敗しました"
 
-#: 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:1482
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr "添付した内容の一覧から指定したアイテムを削除します"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "添付の追加..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ファイル %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 "ファイル %s を添付できません: 通常のファイルではありません"
@@ -11328,19 +11338,19 @@ msgstr "MIME タイプ:"
 msgid "Suggest automatic display of attachment"
 msgstr "添付した内容を自動的に表示するか提示する"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr "メールを作成する前にアカウントを設定して下さい。"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "送信先を指定します"
 
-#: composer/e-msg-composer-hdrs.c:509
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "メッセージを投稿するフォルダを選択して下さい。"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "アドレス帳のためにここでクリック"
 
@@ -11351,45 +11361,45 @@ msgstr "アドレス帳のためにここでクリック"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:573
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "返信先:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:579
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "差出人:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:585
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "件名:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "宛先:"
 
-#: composer/e-msg-composer-hdrs.c:595
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "メッセージの宛先を入力します"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボン・コピー (CC) を受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: 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."
@@ -11400,11 +11410,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "送信先:"
 
-#: composer/e-msg-composer-hdrs.c:615
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "<ここをクリックして投稿するフォルダを選択して下さい>"
 
@@ -11412,14 +11422,14 @@ msgstr "<ここをクリックして投稿するフォルダを選択して下�
 msgid "Attach file(s)"
 msgstr "ファイルの添付"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "送信メッセージに署名できません: このアカウントからの送信に対応した署名付き証"
 "明書がありません。"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11427,7 +11437,7 @@ msgstr ""
 "送信するメッセージを暗号化できません: 利用アカウントに対する暗号化に必要な証"
 "明書セットがありません。"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11436,30 +11446,30 @@ msgstr ""
 "ファイル %s の読み込み中にエラー:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "ファイルがあります。上書きしてもよろしいですか？"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "ファイルへアクセス中にエラー: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "エディタからメッセージを取得できません"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11468,7 +11478,7 @@ msgstr ""
 "ファイル上で読み込み位置へ移動できません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11477,7 +11487,7 @@ msgstr ""
 "ファイルの切り詰めができません: %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"
@@ -11486,7 +11496,7 @@ msgstr ""
 "ファイル・デスクリプタをコピーできません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11495,7 +11505,7 @@ msgstr ""
 "メッセージの自動保存でエラー: %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?"
@@ -11504,7 +11514,7 @@ msgstr ""
 "た。\n"
 "それらのメッセージを復旧してみますか？"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11515,48 +11525,48 @@ msgstr ""
 "\n"
 "この変更を保存しますか？"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "タイトルなしのメッセージ"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "警告: 変更済みのメッセージ"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "署名:"
-
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "署名:"
+
+#: 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> 個あります"
 msgstr[1] "添付ファイルが <b>%d</b> 個あります"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: 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 ""
 "添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "メッセージの作成"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11564,7 +11574,7 @@ msgstr ""
 "コンポーザ・ウィンドウを生成できませんでした:\n"
 "アドレス選択コントロールを開けません。"
 
-#: 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"
@@ -11576,7 +11586,7 @@ msgstr ""
 "正しいバージョンの gtkhtml と libgtkhml が\n"
 "インストールされているか確認して下さい。\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."
@@ -11584,7 +11594,7 @@ msgstr ""
 "コンポーザ・ウィンドウを作成できませんでした:\n"
 "HTML エディタ・コンポーネントを開けません。"
 
-#: composer/e-msg-composer.c:4239
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11739,16 +11749,12 @@ msgstr "カテゴリの同期:"
 
 #. 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 "%Y/%m/%d (%a) %p %I:%M"
 
 #. 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 "%Y/%m/%d (%a) %H:%M"
@@ -11800,31 +11806,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %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 "%p %I時%M分%S秒"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H時%M分%S秒"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I時%M分"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -11905,6 +11903,11 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "比較するもう一つの時間の選択"
 
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>フィルタのルール(_F)</b>"
+
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "ファイル名を指定して下さい。"
@@ -11928,7 +11931,7 @@ msgid "You must specify a folder."
 msgstr "フォルダを指定して下さい。"
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1147
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "フォルダの選択"
 
@@ -11942,19 +11945,19 @@ 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 "重要"
 
 #. 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 "ToDo"
 
 #. 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 "保留"
 
@@ -12003,42 +12006,22 @@ msgid "    "
 msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "<b>Filter Rules</b>"
-msgstr "<b>フィルタのルール</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>Virtual _Folders</b>"
-msgstr "<b>仮想フォルダ(_F)</b>"
-
-#: filter/filter.glade.h:4
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>フィルタのルール(_F)</b>"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>仮想フォルダのソース</b>"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid "Compare against"
 msgstr "逆比較"
 
-#: filter/filter.glade.h:7
-msgid "Edit Filters"
-msgstr "フィルタを編集"
-
-#: filter/filter.glade.h:8
-msgid "Edit VFolders"
-msgstr "仮想フォルダの編集"
-
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "入力"
 
-#: filter/filter.glade.h:10
-msgid "Outgoing"
-msgstr "出力"
-
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12046,7 +12029,7 @@ msgstr ""
 "メッセージの日付は\n"
 "指定した日付の 0:00 と比較されます。"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12054,7 +12037,7 @@ msgstr ""
 "メッセージの日付は、フィルタが実行された時の\n"
 "相対的な時間と比較されます。"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12062,51 +12045,51 @@ msgstr ""
 "メッセージの日付は、フィルタが実行された時の\n"
 "現在の時刻と比較されます。"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "現在時刻への相対時間"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "前"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr " 秒"
 
-#: filter/filter.glade.h:25
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "指定したフォルダだけ"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "現在時刻"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "指定した時間"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "週"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "有効な全てのリモート・フォルダ"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "全てのローカル・フォルダと有効なリモート・フォルダ"
 
-#: filter/filter.glade.h:31
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "全てのローカル・フォルダ"
 
-#: filter/filter.glade.h:32
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "年"
 
@@ -12269,8 +12252,9 @@ msgid "Move to Folder"
 msgstr "フォルダへ移動"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "メッセージを SHELL コマンドにパイプ"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "プログラムを終了します"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12304,23 +12288,24 @@ msgstr "次のものより大きいものを返す"
 msgid "returns less than"
 msgstr "次のものより小さいものを返す"
 
-#: 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 "プログラム実行:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "スコア"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "差出人"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "ステータスの設定"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "SHELL コマンド"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "サイズ (Kバイト)"
@@ -12345,9 +12330,9 @@ msgstr "が次のもので始まる"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
+#: 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:305
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "件名"
@@ -12357,7 +12342,7 @@ msgid "Unset Status"
 msgstr "ステータスの解除"
 
 #: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1007
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "ルール名 '%s' がユニークではありません。別のものを選択して下さい"
@@ -12374,8 +12359,9 @@ msgstr "ルールの編集"
 msgid "Rule name"
 msgstr "ルール名"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "ルールのスコア"
 
 #: filter/searchtypes.xml.h:1
@@ -12410,6 +12396,11 @@ msgstr "件名が次のものを含む"
 msgid "Subject does not contain"
 msgstr "件名が次のものを含まない"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>仮想フォルダ(_F)</b>"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "この仮想フォルダに名前を付けて下さい。"
@@ -12467,8 +12458,8 @@ msgstr "Evolution メール・フォルダ・ビューア"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution メール設定コントロール"
 
-#: 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 "メール"
@@ -12477,53 +12468,50 @@ msgstr "メール"
 msgid "Mail Accounts"
 msgstr "メールのアカウント"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "メールの設定"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "本当にこのアカウントを削除してもよろしいですか？"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "削除しない"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:445
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[デフォルト]"
 
-#: mail/em-account-prefs.c:499
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "アカウント名"
 
-#: mail/em-account-prefs.c:501
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr "名前なし"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "正しいスクリプト名を指定して下さい。"
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[スクリプト]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "言語"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "署名スクリプトの追加"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "署名の追加(_A)"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "署名"
 
@@ -12580,7 +12568,7 @@ msgstr ""
 "このアカウントの草案フォルダを開けません。\n"
 "デフォルトの草案フォルダを使ってもよろしいですか？"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "検索結果から仮想フォルダの作成(_V)..."
 
@@ -12614,7 +12602,7 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: 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:"
@@ -12626,7 +12614,7 @@ msgid "Folder _name:"
 msgstr "フォルダ名(_N):"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:855
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
@@ -12643,118 +12631,118 @@ msgstr "受信箱"
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダ %s の移動中"
 
-#: mail/em-folder-tree.c:876
+#: mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダ %s のコピー中"
 
-#: mail/em-folder-tree.c:883
+#: mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダ %s へメッセージの移動中"
 
-#: mail/em-folder-tree.c:885
+#: mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダ %s へメッセージのコピー中"
 
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:1947
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "フォルダ '%s' を移動できません: 不正な操作です"
 
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1992 mail/em-folder-tree.c:2005
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
 #: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2035
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "フォルダ '%s' の作成中"
 
-#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "フォルダを削除できませんでした: %s"
 
-#: mail/em-folder-tree.c:2361
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "ローカルのフォルダ '%s' を削除できません"
 
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "本当にフォルダ \"%s\" とそのサブフォルダの全てを削除しますか？"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" の削除"
 
-#: mail/em-folder-tree.c:2411
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "ローカルのフォルダ %s の名前を変更できません"
 
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "既にフォルダ名 \"%s\" があります。別の名前を使用して下さい。"
 
-#: mail/em-folder-tree.c:2492 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 "表示(_V)"
 
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "移動(_M)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
-#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
@@ -12892,7 +12880,7 @@ msgstr "スレッド表示のフィルタ"
 
 #. default charset used in mail view
 #: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "デフォルト"
 
@@ -12904,33 +12892,33 @@ msgstr "メッセージの印刷"
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "メール %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 "一致するもの: %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 "署名なし"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12938,21 +12926,21 @@ msgstr ""
 "このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
 "のであることを意味します。"
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr "不正な署名"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr "署名妥当ですが、差出人を検証できません"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12960,11 +12948,11 @@ msgstr ""
 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
 "きません。"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12972,11 +12960,11 @@ msgstr ""
 "このメッセージは暗号化されていません。インターネットを介して閲覧される可能性"
 "があります。"
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -12986,11 +12974,11 @@ msgstr ""
 "です。(現実的には困難ですが)、このメッセージの内容を外部の者に閲覧される可能"
 "性があります。"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12998,11 +12986,11 @@ msgstr ""
 "このメッセージは暗号化されています。外部の者がこのメッセージの内容を閲覧する"
 "ことは困難と思われます。"
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13011,31 +12999,31 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
 "このメッセージの内容を閲覧することは非常に困難と思われます。"
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M に完了"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M まで"
 
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "隠す(_H)"
 
@@ -13044,92 +13032,92 @@ msgstr "隠す(_H)"
 msgid "Page %d of %d"
 msgstr "%d / %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 "'%s' の取得中"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "おかしな external-body 部分です。"
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%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 "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカル・ファイル (%s) にリンクしています"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "リモート・データ (%s) にリンクしています"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
 
-#: mail/em-format-html.c:1129
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "メッセージの整形"
 
-#: mail/em-format-html.c:1406 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:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "差出人"
 
-#: mail/em-format-html.c:1406 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:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "返信先"
 
-#: mail/em-format-html.c:1406 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:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "宛先"
 
-#: mail/em-format-html.c:1406 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:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
+#: 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:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:769
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "メール・クライアント"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1543
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%R %a %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1546
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日付"
 
-#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "ニュースグループ"
 
@@ -13206,22 +13194,22 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: 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 "POP3 UID キャッシュの移行に失敗しました: %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 "フォルダ展開ステータスの移行に失敗しました: %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 "フォルダ '%s' の作成に失敗しました: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "'%s' の格納場所を開けませんでした: %s"
@@ -13260,32 +13248,32 @@ msgstr "アドレス帳に追加(_A)"
 msgid "Open in %s..."
 msgstr "%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 "この格納場所は購読をサポートしていないか、有効になっていません。"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "購読済み"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "フォルダ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "サーバを一つ選択して下さい。"
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "サーバが指定されていません"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "このメッセージを二度と表示しない"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13294,25 +13282,25 @@ msgstr ""
 "フィルタ情報の読み込み中にエラー:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "フィルタ"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 転送するメッセージ --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "差出人が不明"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y/%m/%d (%a) %H:%M %%+05d に %%s さんは書きました:"
 
-#: mail/em-utils.c:1432 mail/em-utils.c:1516 mail/em-utils.c:1525
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13321,7 +13309,7 @@ msgstr ""
 "'%s' へ保存できません。\n"
 " %s"
 
-#: mail/em-utils.c:1437
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13330,35 +13318,35 @@ msgstr ""
 "既に '%s' があります。\n"
 "上書きしてもよろしいですか？"
 
-#: mail/em-utils.c:1480
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "メッセージ"
 
-#: mail/em-utils.c:1532
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "エラー: '%s' は存在していますが、通常のファイルではありません。"
 
-#: mail/em-utils.c:1586
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "メッセージの保存..."
 
-#: mail/em-utils.c:1635
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "住所の追加"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2070
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr "%s からのメッセージ"
 
-#: mail/em-utils.c:2121
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "作業フォルダを作成できませんでした: %s"
 
-#: mail/em-utils.c:2452
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13371,7 +13359,7 @@ msgstr ""
 "\n"
 "本当にこれらのメッセージを削除しますか？"
 
-#: mail/em-utils.c:2477
+#: 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"
@@ -13440,47 +13428,57 @@ msgid "Default height of the Message Window"
 msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "デフォルトの返信スタイル"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "メッセージ作成ウィンドウのデフォルトの幅です。"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "メッセージ・ウィンドウのデフォルトの幅です。"
 
-#: 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 "メッセージ・ウィンドウのデフォルトの幅です。"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "入力した単語の上にスペルエラー表示を描画します。"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "終了時にゴミ箱フォルダを空にする"
 
-#: 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 "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 ""
 "キャレット・モードを有効にします (メールを読む際にカーソルが表示されます)。"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "キャレット・モードの有効/無効"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "メッセージ一覧表示ペインの高さ"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "メッセージ一覧表示ペインの高さです。"
 
-#: 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 "
@@ -13490,19 +13488,19 @@ msgstr ""
 "中に表示される MIME 型は、その内容を表示する際に使用される GNOME の MIME 型"
 "データベースを表示する bonobo コンポーネント・ビューアにマップされます。"
 
-#: 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:27
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "ラベルと対応する色のリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "アカウントのリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: 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."
@@ -13511,11 +13509,11 @@ msgstr ""
 "は /apps/evolution/mail/accounts からの相対的な名前つきサブ・フォルダが含まれ"
 "ます。"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr "カスタムのヘッダとそれらが有効かどうかのリストです。"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: 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."
@@ -13523,15 +13521,15 @@ msgstr ""
 "Evolution メール・コンポーザで利用するラベルのリストです。このリストには "
 "name:color という形式で HTML で使用する色 (16形式) が含まれています。"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "bonobo コンポーネント・ビューアでチェックする MIME 型のリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr "http を介して受信する HTML メッセージの画像読み込み"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: 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 - "
@@ -13541,185 +13539,195 @@ msgstr ""
 "可能な値: 0: 画像を読み込まない、1: 差出人がアドレス帳に登録されている場合は"
 "読み込む、2: 画像を常に読み込む"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "ログのフィルタリング"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "指定したログ・ファイルに対してログのフィルタリング処理を行います。"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "フィルタリングするログ・ファイル"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "フィルタリング処理の対象となるログファイルです。"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "既読マークを付与するまでの時間"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "メールを指定してから既読マークを付与するまでの時間です。"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "メッセージの \"プレビュー\" で使用する引用記号"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "メッセージの \"プレビュー\" で使用する引用記号です。"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "メッセージの表示スタイル (標準、全てのヘッダ、ソース)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: 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:47
+#: 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:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "新着メールの通知で使用するサウンド・ファイル"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "新着メール通知の種類"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "件名が空の場合に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "フォルダを完全に抹消する前にユーザに警告します。"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "送信するメールの件名が空の場合、送信する前に警告します。"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "ユーザが完全削除する際に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "ユーザが Bcc のみ入力したら警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "HTML 形式を希望しない連絡先へ HTML メールを送信する前に確認します。"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ユーザが To/Cc 先を付けずに送信しようとする時に確認します。"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "希望しない HTML をユーザが送信する前に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 "テキストの中に混入されているリンク情報を識別して、URI タグで置き換えます。"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 "テキストの中に混入されているスマイリーの情報を識別して、画像に置き換えます。"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "メールを受信したらスパムテストを実行する"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n です。"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "デフォルトで HTML メールを送信する"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "デフォルトで HTML 形式のメールを送信します。"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "アニメーションの表示可否"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "画像をアニメーションとして表示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "メッセージ一覧の中に削除したメッセージを (打ち消し線を付けて) 表示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "メッセージ一覧の中に削除したメッセージを表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "\"プレビュー\" ウィンドウの表示可否"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "\"プレビュー\" ペインを表示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "新着メールが届いたら演奏するサウンド・ファイルです。"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "ユーザが使用する新着メール通知の種類を指定します。"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "インラインでスペルをチェックする"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "端末のフォント"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "最後にゴミ箱を空にした時間 (1970-01-01 からの経過日数) です。"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "メールを表示するための端末フォントです。"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "メールを表示するための可変幅フォントです。"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: 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;"
@@ -13731,101 +13739,101 @@ msgstr ""
 "enabled&gt; - メール表示ペインの中にヘッダを表示する場合は enabled をセットし"
 "ます。"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "メッセージ一覧をスレッド表示にします。"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "メッセージ一覧のスレッド化"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "メッセージ一覧を件名でスレッド表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "既読マークを付与するまでの時間"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "メッセージを選択してから既読マークを付与するまでの時間です。"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "デフォルト・アカウントの UID (文字列) です。"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Spamasssassin デーモンとクライアントを使用する"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 "Spamasssassin デーモンとクライアント (spamc/spamd) で受信したメールを SPAM "
 "フィルタリングします。"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "カスタム・フォントを使用する"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "メールを表示するフォントにカスタム・フォントを使用します。"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "ローカルの SPAM フィルタリングのみ行います。"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ローカルの SPAM フィルタリングのみ行います (DNS 使用せず)。"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "可変幅フォント"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "メニュー [表示]-[Bcc フィールド] の状態"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "メニュー [表示]-[Bcc フィールド] が有効な状態です。"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "\"Cc フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "メニュー [表示]-[Cc フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "\"差出人フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "メニュー [表示]-[差出人フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "\"送信先フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "メニュー [表示]-[送信先フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "\"返信先フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "メニュー [表示]-[返信先フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: 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."
@@ -13833,11 +13841,11 @@ msgstr ""
 "メッセージに In-Reply-To または Refeences ヘッダが無い場合に、件名によるス"
 "レッド表示で fall back するかどうかを指定します。"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "ユーザが起動した spamd のポート番号です。"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "spamd のポート番号"
 
@@ -13876,14 +13884,14 @@ msgstr "Evolution は古い Elm 形式メールをインポート中です"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "インポート中..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "少々お待ち下さい"
 
@@ -13928,12 +13936,12 @@ msgstr "mailbox のインポート"
 msgid "Scanning %s"
 msgstr "%s の解析"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "優先度フィルタ \"%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"
@@ -13958,7 +13966,7 @@ msgstr ""
 "スコアに変換し、優先度の代わりにスコアを利用するフィルタになります。\n"
 "意図したように動作するか、インポートしたフィルタをチェックして下さい。"
 
-#: 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"
@@ -13970,7 +13978,7 @@ msgstr ""
 "Evolution ではこのフィルタリングをサポートしていません。\n"
 "これらのフィルタは将来的に利用できなくなります。"
 
-#: 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"
@@ -13984,23 +13992,23 @@ msgstr ""
 "これらのフィルタは文字列がメールの中に含まれているか否かを\n"
 "テストするように変更されました。"
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution は古い Netscape データのインポート中です"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "Netscape データのインポート"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "設定"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "メールのフィルタ"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14032,62 +14040,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "現在の形式:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "インデックスの内容を含める"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "新しい形式:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"注意: メールボックスの形式を変換するときに発生した問題\n"
-"(例: ディスク容量の不足) を自動的に修復する\n"
-"ことはできないかもしれません。この機能は注意して使用して下さい。"
-
-#: 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 "必要な情報の全てを埋めていません。"
 
 #. 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 アカウント・エディタ"
 
-#: mail/mail-account-gui.c:790 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#: mail/mail-account-gui.c:794 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "ユーザ名:"
 
-#: mail/mail-account-gui.c:798 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "パス(_P):"
 
-#: mail/mail-account-gui.c:2074
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "同じ名前のアカウントを二つ作れません。"
 
@@ -14120,11 +14094,11 @@ msgstr "%s へ返信"
 msgid "Add Filter Rule"
 msgstr "フィルタ・ルールの追加"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "次のフィルタ・ルール:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14167,11 +14141,11 @@ msgstr "新しいメール・フォルダを作成します"
 msgid "URI of the mail source that the view will display"
 msgstr "表示するメール・ソースの URI"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "身元情報"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14181,11 +14155,12 @@ msgstr ""
 "ではありませんが、送信する E-メールの中にこの情報を挿入する場合は入力して下さ"
 "い。"
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14193,15 +14168,15 @@ msgstr ""
 "メールを受信するサーバの情報を入力して下さい。不明な場合は、システム管理者ま"
 "たはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "オプションを以下から選択して下さい。"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14209,11 +14184,11 @@ msgstr ""
 "メールを送信する方法について情報を入力して下さい。不明な場合は、システム管理"
 "者またはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "アカウント管理"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14225,124 +14200,257 @@ msgstr ""
 "の送信方法は Evolution メールアカウントと一緒にまとめられます。このアカウント"
 "の名前を下の空欄に入力して下さい。この名前は表示目的のみに使用されます。"
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "サービスの確認"
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr " サポートしているかチェックする(_C) "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "プレビュー"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(この Evolution は SSL サポート付きで作成されていません)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(この Evolution は SSL サポート付きで作成されていません)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>ステータス:</b> "
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>ステータス:</b> "
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>表示するヘッダの項目(_D)</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 "暗号化したメールを送信する場合は、メール全体も暗号化する(_L)"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "アカウント・エディタ"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "アカウント情報"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "新着メールのチェック"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "スクリプトの追加(_R)"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "新しい署名の追加..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_W)"
+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>表示するヘッダの項目(_D)</b>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "常に使用する Bcc 先(_B):"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "常に使用する CC 先(_C):"
+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 "新着メールの通知"
+
+#: 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 "ちょっとしたプライバシー (PGP/GnuPG)"
+
+#: 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 "送信済と草案メッセージ"
+
+#: 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 "暗号化したメールを送信する場合は、メール全体も暗号化する(_L)"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "アカウント・エディタ"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "新しい署名の追加..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "スクリプトの追加(_R)"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_W)"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "常に使用する CC 先(_C):"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "常に使用する Bcc 先(_B):"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_Y)"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "暗号解読時に常に信用キーを使用する(_T)"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "オリジナルのメッセージを添付する"
 
-#: 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 "添付する"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "認証方式"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "スマイリー・アイコンを自動的に挿入する(_A)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "新着メールを自動的にチェックする(_A)"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルチック語 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルチック語 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "新着メールが届いたらビープ音を鳴らす(_B)"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "文字セット(_H):"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "色(_O)"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " サポートしているかチェックする(_C) "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "受信時にチェックする(_I)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "入力時にスペル・チェックする(_T)"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "新着メールのチェック"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 "受信したメール・メッセージがジャンク (SPAM; UCE, UBE) かどうかチェックします"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "スペルミスした文字の色(_M):"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "メッセージの生成"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "色(_O)"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "設定"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "フォルダを抹消する前に確認する(_C)"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14358,273 +14466,261 @@ msgstr ""
 "\n"
 "\"適用\" をクリックして設定を保存して下さい。"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "デフォルトの動作"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "デフォルトの文字エンコード(_E): "
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "メールの削除中"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "送信するメッセージにデジタル署名する (デフォルト)(_S)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "デフォルト(_D)"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "オリジナルのメッセージを引用しない"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "会議開催要求に合意しない (Outlook 互換)"
 
-#: 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 "完了"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "草案フォルダ(_F):"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-メール・アカウント"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "E-メール・アドレス(_A):"
 
-#: 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 "終了時にゴミ箱フォルダを空にする(_T)"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "暗号化する証明書(_P):"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウント・アシスタント"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "コマンドの実行..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "固定幅(_X):"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "フィルタリングのオプション"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "フォントのプロパティ"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "HTML の中のメッセージを整形する(_H)"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "HTML 形式のメール(_H)"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "ヘッダ(_E)"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "引用を強調表示する(_Q)"
 
-#: 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 "インラインにする"
 
-#: 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 "ラベルと色"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "画像の読み込み"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "メールボックスの場所"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "メッセージ作成"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "メッセージの表示"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "メッセージのフォント"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "新着メールの通知"
-
-#: 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"
 msgstr "注意: 最初に接続するまで、パスワードの入力は求められません。"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "追加情報"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "組織(_G):"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GnuPG キー ID(_K):"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "色の選択"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "新着メールが届いたらサウンドを演奏する(_P)"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Bcc 受信者のみ指定されている場合は送信する前に確認する(_O)"
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "ちょっとしたプライバシー (PGP/GnuPG)"
-
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "印刷用フォント"
-
-#: 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 "オリジナルのメッセージを引用する"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "引用する"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "このパスワードを記憶する(_M)"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "このパスワードを記憶する"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "返信先(_P):"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "返信オプション(_O)"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "このパスワードを記憶する(_P)"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "必須情報"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "初期値に戻す"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "このパスワードを記憶する"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "セキュリティ(_E)"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "標準フォント(_S):"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "セキュリティ保護された MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "セキュリティ(_S)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "HTML 表示の固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "印刷時の HTML 固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "HtML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "印刷時の HTML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "選択(_S)..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダ(_M):"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "送信済と草案メッセージ"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "サーバ認証を行う(_V)"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "サーバの設定"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "サーバ種別(_T):"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "署名する証明書(_G):"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "署名:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "署名(_S):"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "ファイル名の指定(_F):"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "スペル・チェック(_C)"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "端末のフォント(_T):"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "種別:"
+
+#: 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"
@@ -14633,7 +14729,7 @@ msgstr ""
 "このスクリプトの出力を署名として使用します。\n"
 "\"名前\" は表示の目的でのみ使用されます。"
 
-#: 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 "
@@ -14642,7 +14738,7 @@ msgstr ""
 "このページでは、スペル・チェックとその対象言語を設定します。インストールした"
 "辞書の言語のみ一覧に表示されます。"
 
-#: 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\""
@@ -14650,15 +14746,15 @@ msgstr ""
 "このアカウントに対してお好みの名前を入力して下さい。\n"
 "(例: \"仕事\" または \"プライベート\")"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "デーモンを使用する(_D)"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "可変幅(_A):"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14668,167 +14764,100 @@ msgstr ""
 "\n"
 "[進む] ボタンをクリックして下さい。"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "署名の追加(_A)"
 
-#: 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 "常に画像を読み込まない(_A)"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_Y)"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "認証種別(_A): "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "認証方法(_A): "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "新着メールを自動的にチェックする(_A)"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "スマイリー・アイコンを自動的に挿入する(_A)"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "新着メールが届いたらビープ音を鳴らす(_B)"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "フォルダを抹消する前に確認する(_C)"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "デフォルトの署名(_D):"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "デフォルト(_D)"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "送信するメッセージにデジタル署名する (デフォルト)(_S)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "新着メールが届いても通知しない(_D)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "有効(_E)"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "送信メッセージを暗号化する (デフォルト)(_E)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "氏名(_F):"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "HTML 形式のメール(_H)"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "身元情報(_I)"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "ジャンク(_J)"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "アドレス帳に登録された差出人の場合は画像を読み込む(_L)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "ローカル・メールのチェックのみ(_L)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "これをデフォルトのアカウントにする(_M)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "メッセージに\"既読\"マークを付与する時間(_M)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: 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 "二度と画像を読み込まない(_N)"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "新着メールが届いたらサウンドを演奏する(_P)"
-
-#: 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 "HTML 形式を希望しない連絡先へ送信する場合は確認する(_P)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "件名が空の場合は送信する前に確認する(_P)"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "メールの受信(_R)"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "返信方法(_R):"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "初期値に戻す(_R)"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "スクリプト(_S):"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "選択(_S)..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "メールの送信(_S)"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "アニメーションを表示する(_S)"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "署名(_S):"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "標準フォント(_S):"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "端末のフォント(_T):"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "セキュリティ保護された接続 (SSL) の利用(_U):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "分"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "色"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "説明"
 
@@ -14837,7 +14866,7 @@ msgstr "説明"
 msgid "Pinging %s"
 msgstr "%s へ ping"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14846,7 +14875,7 @@ msgstr ""
 "'%s' する際にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14855,7 +14884,7 @@ msgstr ""
 "次の操作を実行する際にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "作業"
 
@@ -14976,16 +15005,20 @@ msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
 #: mail/mail-ops.c:1838
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "メッセージ %d 通の受信中"
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "メッセージ %d 通の受信中"
+msgstr[1] "メッセージ %d 通の受信中"
 
-#: mail/mail-ops.c:1922
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "メッセージ %d 通の保存中"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "メッセージ %d 通の保存中"
+msgstr[1] "メッセージ %d 通の保存中"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14994,7 +15027,7 @@ msgstr ""
 "出力ファイルを生成できません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15003,11 +15036,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "添付した内容の保存中"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15016,17 +15049,17 @@ msgstr ""
 "出力ファイルを生成できません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出せませんでした: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s からの接続はありません"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s へ再接続"
@@ -15043,84 +15076,80 @@ msgstr "メッセージの中を検索"
 msgid "Find:"
 msgstr "検索:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "検索"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "デジタル署名"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "暗号化"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "セキュリティ情報"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "キャンセル中..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "サーバ: %s  種別: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "パス: %s  種類: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "種別: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "メールの送信/受信"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "全てキャンセル(_A)"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "更新中..."
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "ユーザによって操作がキャンセルされました"
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s のパスワードを入力して下さい"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "パスワードの入力"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "このパスワードを記憶する(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "このパスワードをこのセッション用に保存する(_R)"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "署名ファイルを保存できませんでした: %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"
@@ -15130,23 +15159,23 @@ msgstr ""
 "\n"
 "その変更を保存しますか？"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "変更の破棄(_D)"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "署名の保存"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "署名の編集"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "この署名の名前を入力して下さい。"
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "名前:"
 
@@ -15174,17 +15203,17 @@ msgstr "転送されたメッセージ"
 msgid "Invalid folder: `%s'"
 msgstr "不正なフォルダ: '%s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "仮想フォルダの設定: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "URI 用の仮想フォルダの更新: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15197,84 +15226,84 @@ msgstr ""
 "     '%s'\n"
 "更に更新されています。"
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "仮想フォルダの編集"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "存在しない仮想フォルダ '%s' を編集しようとしています。"
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "新しい仮想フォルダ"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "最も低い"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "低い"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "高い"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "最も高い"
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l時%M分"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l時%M分"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%p %l時%M分 (%a)"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%B %e日 %p %l時%M分"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr "%Y年 %B %e日"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "メッセージ一覧の作成中"
 
@@ -15359,7 +15388,8 @@ msgstr ""
 "\"フラグ\" メニューからフォローアップの内容を選択して下さい。"
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "期日(_D):"
 
 #: mail/message-tags.glade.h:7
@@ -15565,7 +15595,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "インポート先の選択"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr "インポートしたい情報を選択して下さい:"
 
@@ -15595,26 +15625,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "インポーターの選択"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr "ファイル %s がありません"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "インポート中"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "%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 "%s のロード中にエラーが発生しました"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15623,31 +15653,31 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム 1 をインポート中"
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "自動"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "ファイル名(_F):"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "ファイルの選択"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "ファイルの種類(_T):"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "以前のバージョンからデータとその設定をインポートする(_O)"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "ファイル単体をインポートする(_S)"
 
-#: 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"
@@ -15655,25 +15685,25 @@ msgstr ""
 "少々お待ち下さい...\n"
 "既存の設定を読み込んでいます。"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "インテリジェント・インポーターの起動"
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "差出人 %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "ファイル %s で利用できるインポータがありません"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "インポータを実行できません"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "インポート(_I)"
 
@@ -15681,7 +15711,7 @@ msgstr "インポート(_I)"
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution の設定"
 
@@ -15715,11 +15745,11 @@ msgstr "共有フォルダが開けませんでした: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "指定した共有フォルダが見つかりません。"
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "インポートの開始"
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15838,7 +15868,6 @@ msgstr "チェックボックス"
 
 #: 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 "新規"
 
@@ -15892,16 +15921,17 @@ msgid "Create a new test item"
 msgstr "新しいタスク・アイテムを作成します"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "接続を有効にする"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "[OK] ボタンをクリックすると接続を閉じてオフラインになります"
+msgid "Active Connections"
+msgstr "接続を有効にする"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "次の接続が現在有効です:"
+msgid "Click OK to close these connections and go offline"
+msgstr "[OK] ボタンをクリックすると接続を閉じてオフラインになります"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16019,28 +16049,28 @@ msgstr ""
 "ここでは外部のファイルを Evolution へ\n"
 "インポートする手順をご案内します。"
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "インポート"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "インポート"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "インポートしない"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "このメッセージを二度と表示しない"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution は以下のファイルからデータ取込みが可能です:"
 
 #. 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"
@@ -16076,7 +16106,7 @@ msgstr ""
 "私たちの激務の結果に満足してくれることを願い、\n"
 "そしてあなたの貢献を熱心に待っています！\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16084,48 +16114,48 @@ msgstr ""
 "感謝します。\n"
 "Ximian Evolution チーム\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "このメッセージを二度と表示しない"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution シェルにアクセスできません。"
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution シェルを初期化できません: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "指定したコンポーネントを有効にして Evolution を起動する"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "オフライン・モードで起動する"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "オンライン・モードで起動する"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "全ての Evolution コンポーネントを強制終了する"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4系から関連ファイルを強制的に移行する"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "全てのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16134,30 +16164,30 @@ msgstr ""
 "%s: --online と --offline は同時には使用できません。\n"
 "  詳細は %s --help をご覧下さい。\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 "インポートする証明書の選択..."
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:545
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
-#: 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 "利用の目的"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "有効期限"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
@@ -16166,17 +16196,17 @@ msgstr "E-メール・アドレス"
 msgid "Certificate Viewer: %s"
 msgstr "証明書ビューア: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "'%s' のパスワードを入力して下さい"
 
 #. we're setting the password initially
-#: smime/gui/component.c:64
+#: smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "データベースを証明する新しいパスワードを入力して下さい"
 
-#: smime/gui/component.c:66
+#: smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "新しいパスワードの入力"
 
@@ -16369,7 +16399,8 @@ msgstr "次の人達の身元を確認できる証明書 (ファイル) があ�
 msgid "Your Certificates"
 msgstr "ユーザの証明書"
 
-#: smime/lib/e-cert-db.c:582
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr "既に証明書があります"
 
@@ -16640,7 +16671,7 @@ msgstr "連絡先を他のフォルダへ移動..."
 msgid "Move to Folder..."
 msgstr "フォルダへ移動..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
@@ -16650,7 +16681,7 @@ msgstr "連絡先の印刷プレビューを表示します"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "印刷プレビュー(_V)"
 
@@ -16698,13 +16729,13 @@ msgstr "読み込みを停止します"
 msgid "View the current contact"
 msgstr "現在の連絡先の表示"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h: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 "アクション(_A)"
 
@@ -16725,14 +16756,10 @@ msgid "_Save as VCard"
 msgstr "vCard 形式で保存(_S)"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "連絡先の検索(_S)"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "全て選択(_A)"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "連絡先へメールの送信(_S)..."
 
@@ -16740,58 +16767,54 @@ msgstr "連絡先へメールの送信(_S)..."
 msgid "Day"
 msgstr "日"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "全てのイベントの削除"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "予定を削除します"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "このイベントの削除"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "このイベントを削除します"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "移動"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "前へ戻ります"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "次へ進みます"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "指定日に移動(_D)"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "指定日に移動します"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "今日へ移動します"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "一覧"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "月"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "次へ"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "印刷されるカレンダのプレビューを表示します"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "前へ"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "このカレンダを印刷します"
@@ -16800,7 +16823,7 @@ msgstr "このカレンダを印刷します"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "このカレンダの予定の有無を公開します"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "抹消(_E)"
 
@@ -16809,34 +16832,54 @@ msgid "Purge old appointments and meetings"
 msgstr "古い予定と会議を完全に削除します"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "全てのテキストを選択します"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "指定日に移動します"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "フォルダの選択"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "一覧形式で表示します"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "1 日を表示します"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "1 ヶ月を表示します"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "1 週間を表示します"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "平日を表示します"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "今日"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "現在の予定の表示"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "週"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "予定を開く(_O)"
 
@@ -17373,10 +17416,6 @@ msgstr "移動"
 msgid "Move selected message(s) to another folder"
 msgstr "選択したメッセージを別のフォルダへ移動します"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "次へ"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "次の重要なメッセージへ(_I)"
@@ -17425,10 +17464,6 @@ msgstr "前の重要なメッセージへ(_E)"
 msgid "Preview the message to be printed"
 msgstr "印刷されるメッセージのプレビューを表示します"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "前へ"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "メッセージを印刷します"
@@ -17839,39 +17874,39 @@ msgstr "選択したタスクをクリップボードにコピーします"
 msgid "Cut selected task"
 msgstr "選択したタスクを切り取ります"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "完了したタスクを削除します"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "選択したタスクを削除します"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "完了マークの付与(_K)"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "選択したタスクに完了マークを付与します"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "クリップボードからタスクを貼り付けます"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "タスク一覧の印刷プレビューを表示します"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "タスク一覧を印刷します"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "選択したタスクを表示します"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "タスクを開く(_O)"
 
@@ -18000,10 +18035,15 @@ msgid "_Day View"
 msgstr "日間ビュー(_D)"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "一覧表示"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "月間ビュー(_M)"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "平日ビュー(_W)"
 
@@ -18032,10 +18072,16 @@ msgid "_Messages"
 msgstr "メッセージ(_M)"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "カテゴリ付き(_C)"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "期日:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "ステータスの設定"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "タスク(_T)"
 
@@ -18098,10 +18144,6 @@ msgstr "%Y年 %B"
 msgid "Now"
 msgstr "今"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "今日"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18111,82 +18153,87 @@ msgstr "時間はフォーマットに入れなければなりません: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "バルト語"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "中欧"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "中国語"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "キリル文字"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "日本語"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "韓国語"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "ユニコード"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "西欧"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "西欧"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "繁体字中国語"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "簡体字中国語"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "ウクライナ"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "表示"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "不明な文字セット: %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 "文字エンコード"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "使用する文字セットを入力して下さい"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "その他..."
 
@@ -18250,6 +18297,11 @@ msgstr "表示部のスペース挿入"
 msgid "Spacing around expander arrow"
 msgstr "エキスパンダの矢印の周りに配置する領域"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "検索(_S)"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "検索エディタ"
@@ -18312,3 +18364,240 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
+
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "アドレス帳のソース"
+
+#~ msgid "Selected:"
+#~ msgstr "選択済:"
+
+#~ msgid "1 contact"
+#~ msgstr "連絡先 1個"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "と他に %d 個の連絡先。"
+
+#~ msgid "1 day"
+#~ msgstr "1 日"
+
+#~ msgid "1 week"
+#~ msgstr "1 週間"
+
+#~ msgid "1 hour"
+#~ msgstr "1 時間"
+
+#~ msgid "1 minute"
+#~ msgstr "1 分"
+
+#~ msgid "1 second"
+#~ msgstr "1 秒"
+
+#~ msgid "Description"
+#~ msgstr "説明"
+
+#~ msgid "component"
+#~ msgstr "コンポーネント"
+
+#~ msgid "Alarms"
+#~ msgstr "アラーム"
+
+#~ msgid "Geographical position"
+#~ msgstr "緯度経度"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "%d 日毎"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "%d 週間毎"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "次の %d 週間毎 "
+
+#~ msgid "every %d months"
+#~ msgstr "%d 月毎"
+
+#~ msgid "Every %d years"
+#~ msgstr "%d 年毎"
+
+#~ msgid "Go To Date"
+#~ msgstr "指定日へ移動"
+
+#~ msgid "_Go To Today"
+#~ msgstr "今日へ移動(_G)"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP サーバ名:"
+
+#~ msgid "Search base:"
+#~ msgstr "検索ベース:"
+
+#~ msgid "<b>Filter Rules</b>"
+#~ msgstr "<b>フィルタのルール</b>"
+
+#~ msgid "Edit Filters"
+#~ msgstr "フィルタを編集"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "仮想フォルダの編集"
+
+#~ msgid "Outgoing"
+#~ msgstr "出力"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "メッセージを SHELL コマンドにパイプ"
+
+#~ msgid "Shell Command"
+#~ msgstr "SHELL コマンド"
+
+#~ msgid "[script]"
+#~ msgstr "[スクリプト]"
+
+#~ msgid "Add script signature"
+#~ msgstr "署名スクリプトの追加"
+
+#~ msgid "Current store format:"
+#~ msgstr "現在の形式:"
+
+#~ msgid "Index body contents"
+#~ msgstr "インデックスの内容を含める"
+
+#~ msgid "New store format:"
+#~ msgstr "新しい形式:"
+
+#~ 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 ""
+#~ "注意: メールボックスの形式を変換するときに発生した問題\n"
+#~ "(例: ディスク容量の不足) を自動的に修復する\n"
+#~ "ことはできないかもしれません。この機能は注意して使用して下さい。"
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(この Evolution は SSL サポート付きで作成されていません)"
+
+#~ msgid "Account Information"
+#~ msgstr "アカウント情報"
+
+#~ msgid "Authentication"
+#~ msgstr "認証方式"
+
+#~ msgid "Composing Messages"
+#~ msgstr "メッセージの生成"
+
+#~ msgid "Configuration"
+#~ msgstr "設定"
+
+#~ msgid "Default Behavior"
+#~ msgstr "デフォルトの動作"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "メールの削除中"
+
+#~ msgid "Filter Options"
+#~ msgstr "フィルタリングのオプション"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "ラベルと色"
+
+#~ msgid "Loading Images"
+#~ msgstr "画像の読み込み"
+
+#~ msgid "Message Display"
+#~ msgstr "メッセージの表示"
+
+#~ msgid "Message Fonts"
+#~ msgstr "メッセージのフォント"
+
+#~ msgid "Optional Information"
+#~ msgstr "追加情報"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "印刷用フォント"
+
+#~ msgid "Re_member this password"
+#~ msgstr "このパスワードを記憶する(_M)"
+
+#~ msgid "Remember this _password"
+#~ msgstr "このパスワードを記憶する(_P)"
+
+#~ msgid "Required Information"
+#~ msgstr "必須情報"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "初期値に戻す"
+
+#~ msgid "S_ecurity"
+#~ msgstr "セキュリティ(_E)"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "セキュリティ保護された MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "サーバの設定"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "認証種別(_A): "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "認証方法(_A): "
+
+#~ msgid "_Default signature:"
+#~ msgstr "デフォルトの署名(_D):"
+
+#~ msgid "_Full name:"
+#~ msgstr "氏名(_F):"
+
+#~ msgid "_Identity"
+#~ msgstr "身元情報(_I)"
+
+#~ msgid "_Junk"
+#~ msgstr "ジャンク(_J)"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "メールの受信(_R)"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "初期値に戻す(_R)"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "メールの送信(_S)"
+
+#~ msgid "Search"
+#~ msgstr "検索"
+
+#~ msgid "Digital Signature"
+#~ msgstr "デジタル署名"
+
+#~ msgid "Encryption"
+#~ msgstr "暗号化"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "次の接続が現在有効です:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "連絡先の検索(_S)"
+
+#~ msgid "Go to _Date"
+#~ msgstr "指定日に移動(_D)"
+
+#~ msgid "Go to today"
+#~ msgstr "今日へ移動します"
+
+#~ msgid "With _Category"
+#~ msgstr "カテゴリ付き(_C)"
diff --git a/po/ko.po b/po/ko.po
index d373857eb9..f981096904 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,16 +6,59 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-14 00:22+0900\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-03-14 00:32+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\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=1; plural=0;\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 주소록"
+
+# command line help
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "로컬 주소록 폴더 목록을 보입니다"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "다른 이름으로 저장"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "카드"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "카드"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "연락처:"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution 알림"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
@@ -46,7 +89,6 @@ msgstr "여기서 자동 완성을 설정합니다"
 #. 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 +136,91 @@ msgstr "여기서 s/MIME 인증서를 관리합니다"
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' 주소록을 지우게 됩니다. 정말로 계속 하시겠습니까?"
 
-#: 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 "새 주소록"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "지우기"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "등록 정보..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "새 연락처"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "연락처(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "새로운 연락처를 만듭니다"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "새 연락처 목록"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "연락처 목록(_L)"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "새 연락처 목록을 만듭니다"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "새 주소록"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "주소록"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "새 작업을 만듭니다"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP 서버에 연결 실패"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 서버에서 인증 실패"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "루트 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 "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "스키마 정보를 가져오는 데 오류가 발생했습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다"
 
@@ -189,20 +247,18 @@ msgid "Migrating `%s':"
 msgstr "`%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 "이 컴퓨터"
 
 #. 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 "개인"
 
@@ -254,7 +310,7 @@ msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습
 msgid "This query did not complete successfully."
 msgstr "이 질의가 성공적으로 끝나지 않았습니다."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -262,7 +318,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  해당 경로가 있고 그 경로에 접근할 권한이 있는 "
 "지 확인하십시오."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -270,7 +326,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
 "할 수 없습니다."
 
-#: 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 "
@@ -280,7 +336,7 @@ msgstr ""
 "려면 아래의 바로가기에서 OpenLDAP를 받아 온 다음에 CVS 소스에서 프로그램을 컴"
 "파일해야 합니다."
 
-#: 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."
@@ -288,28 +344,28 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
 "없습니다."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "주소록을 열 수 없습니다"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "익명으로 LDAP 서버 사용"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "인증하는 데 실패했습니다.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s(사용자 %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"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr "달력에 보여줄 URI"
 
@@ -332,16 +388,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "이름 선택 대화 상자에 마지막으로 사용되었던 폴더의 URI"
 
 #: 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 " 지원하는 기준 보기(_H) "
 
-#: 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
@@ -356,59 +406,51 @@ msgstr " 지원하는 기준 보기(_H) "
 #: 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 "주소록 만들기 도우미"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "주소록 등록 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "주소록 원본"
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "항상"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "익명으로"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid ""
 "Congratulations, you are\n"
 "\t      finished setting up this address book.\n"
@@ -420,50 +462,50 @@ msgstr ""
 "\n"
 "입력한 설정 사항을 저장하려면 \"적용\" 단추를 누르십시오."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "연결중"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "구별되는 이름(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "전자메일 주소:"
 
-#: 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은 이 DN으로 서버에 인증할 때 사용합니다"
 
-#: 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은 이 메일 주소로 서버에 인증할 때 사용합니다"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "끝"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "일반"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "그룹:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "항상 사용 않음"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -478,23 +520,19 @@ msgstr ""
 "씁니다.\n"
 "LDAP 서버가 이 프로토콜을 지원하는 지 시스템 관리자에게 물어보십시오."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "한 단계"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "찾기 범위(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "찾는 중"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "선택:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -503,7 +541,7 @@ msgstr ""
 "이 옵션을 선택하면 LDAP 서버가 SSL이나 TLS를 지원하는 경우에만 Evolution에서 "
 "연결합니다."
 
-#: 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"
@@ -519,7 +557,7 @@ msgstr ""
 "전하므로\n"
 "Evolution에서 SSL/TLS를 사용할 필요가 없습니다."
 
-#: 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"
@@ -530,7 +568,7 @@ msgstr ""
 "이 옵션을 선택하면 서버에서 SSL이나 TLS를 지원하지 않는다는 의미입니다.\n"
 "연결이 안전하지 않을 수도 있고, 보안상의 침투에 취약할 수 있습니다."
 
-#: 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 "
@@ -540,7 +578,7 @@ msgstr ""
 "이 옵션을 선택하면 LDAP 찾기, 연락처 만들기/편집에 대한 Evolution 설정 기본값"
 "을 바꿀 수 있습니다."
 
-#: 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"
@@ -550,32 +588,32 @@ msgstr ""
 "\t\t\t  맨 처음 단계에서\n"
 "\t\t\t  표시할 이름과 그룹을 지정합니다."
 
-#: 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 "단계 1: 폴더 특성"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "단계 2: 서버 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "단계 3: 서버에 연결"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "단계 4: 디렉토리 찾기"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "아래"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "지원하는 찾기 기준"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -587,7 +625,7 @@ msgstr ""
 "것인지를\n"
 "조정합니다. 이 옵션을 바꿔야 하는 경우에 시스템 관리자에게 문의하십시오."
 
-#: 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"
@@ -597,7 +635,7 @@ msgstr ""
 "찾기 기준은 찾기를 시작할 엔트리의 고유 이름(distinguished name, DN)입니다.\n"
 "찾기 기준을 비워두면, 디렉토리 트리의 맨 위 폴더부터 찾기 시작합니다."
 
-#: 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"
@@ -611,7 +649,7 @@ msgstr ""
 "찾기 범위가 \"한 단계\"이면 찾기 기준에서 한 단계 아래의 엔트리만 포함합니"
 "다.\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"
@@ -625,13 +663,13 @@ msgstr ""
 "만드는 주소록의 종류에 따라서, 몇가지 조건을 더 입력해야 할 수도 있습니다.\n"
 "이 정보를 찾는 데 어려움이 있으면 시스템 관리자에게 문의하십시오."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP 서버의 완전한 이름입니다. 예를 들어 \"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"
@@ -640,7 +678,7 @@ msgstr ""
 "내려 받을 항목의 최대 개수입니다. 이 숫자를 너무 크게 하면\n"
 "주소록의 속도가 느려집니다."
 
-#: 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 "
@@ -649,7 +687,7 @@ msgstr ""
 "인증하는 방법입니다. \"전자메일 주소\"로 설정하면 반드시 LDAP 서버에 익명 접"
 "근이 가능해야 합니다."
 
-#: 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"
@@ -658,7 +696,7 @@ msgstr ""
 "Evolution 폴더 목록에 나타날 이 서버의 이름입니다.\n"
 "표시하는 목적으로만 쓰입니다. "
 
-#: 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 "
@@ -666,7 +704,7 @@ msgid ""
 msgstr ""
 "Evolution 폴더 목록에 나타날 이름입니다.  표시하는 목적으로만 쓰입니다. "
 
-#: 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"
@@ -676,28 +714,28 @@ msgstr ""
 "Evolution에서 연결할 LDAP 서버의 포트 번호입니다. 표준 포트 번호 목록이 제공"
 "됩니다. 어떤 포트를 지정해야 할 지는 시스템 관리자에게 물어보십시오."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr "찾기를 얼마나 오래동안 실행할 지 조정하는 옵션입니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS 사용(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "구별되는 이름 (Distinguished Name, DN) 사용해서"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "전자메일 주소 사용해서"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "가능하면 언제나"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -708,60 +746,48 @@ msgstr ""
 "다.\n"
 "무슨 정보를 입력할 지 잘 모르겠다면 시스템 관리자에게 문의하십시오."
 
-#: 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 "표시 이름(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: 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 "편집(_E)"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "로그인 방법(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "포트 번호(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "서버 이름(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "제한 시간(분)(_T):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "카드"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "연결-탭"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "일반-탭"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "찾기-탭"
 
@@ -793,7 +819,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML 메일 보내기?"
 
 #: 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 "연락처에 더하기"
 
@@ -810,7 +836,7 @@ msgstr "이름"
 # FIXME - 무슨 뜻?
 #: 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 "원본"
 
@@ -877,7 +903,8 @@ msgstr "협력"
 
 #. 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 "연락처 편집기"
 
@@ -886,7 +913,7 @@ msgid "D_epartment:"
 msgstr "부서(_E):"
 
 #: 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 "자세히"
@@ -970,16 +997,27 @@ msgstr "분류(_C)..."
 
 #. 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:765 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 "지우기(_D)"
 
+#: 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 "편집(_E)"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "집(_H):"
@@ -1023,21 +1061,21 @@ msgstr "홈페이지 주소(_W):"
 
 #: 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 "주소"
 
 #: 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 "편집 가능"
 
@@ -2018,7 +2056,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"
@@ -2033,20 +2071,21 @@ msgid "MSN Messenger"
 msgstr "MSN 메신저"
 
 #: 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 "서비스"
 
 #: 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 "위치"
 
@@ -2055,112 +2094,96 @@ msgid "Username"
 msgstr "사용자이름"
 
 #: 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 "집"
 
 #. 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 "업무"
 
 #: 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 "기타"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: 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 "연락처"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "바뀜"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "계정 이름"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "분류 편집기를 사용할 수 없습니다."
 
-#: 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 "이 연락처는 다음 분류에 속합니다:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "VCard로 연락처를 저장"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"정말로 이 계정을\n"
-"지우시겠습니까?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"정말로 이 연락처를\n"
-"지우시겠습니까?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "직장"
 
-#: 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 "야후"
 
-#: 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 "필드에 대한 위젯을 찾을 수 없습니다: `%s'"
@@ -2174,6 +2197,7 @@ msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "전체 이름(_F):"
 
@@ -2181,6 +2205,22 @@ msgstr "전체 이름(_F):"
 msgid "E-_mail:"
 msgstr "전자메일(_M):"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"정말로 이 계정을\n"
+"지우시겠습니까?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"정말로 이 연락처를\n"
+"지우시겠습니까?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "주소 _2:"
@@ -2299,6 +2339,10 @@ msgstr "메신저 서비스(_I):"
 msgid "_Location:"
 msgstr "위치(_L):"
 
+#: 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 "구성원"
@@ -2319,25 +2363,26 @@ msgstr "메일주소를 입력하거나 연락처를 아래의 목록으로 끌�
 msgid "contact-list-editor"
 msgstr "연락처 목록 편집기"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "북"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "새 목록"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr "연락처 목록 편집기"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "VCard로 목록 저장"
 
@@ -2389,23 +2434,20 @@ msgid "No contacts"
 msgstr "연락처 없음"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "연락처 1개"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "연락처 %d개"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "연락처 %d개"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "쿼리"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "주소록 보기를 가져오는 데 오류가 발생했습니다"
 
@@ -2417,129 +2459,128 @@ msgstr "모델"
 msgid "Error modifying card"
 msgstr "카드를 바꾸는 데 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "이름 시작"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "전자메일 시작"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "분류"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "필드에 포함"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr "고급..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "형태"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
 msgstr "주소록"
 
-#: 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 "VCard로 저장"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "새 연락처..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "새 연락처 목록..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "폴더로 가기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "가져오기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "연락처 찾기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
 msgstr "주소록 원본..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "파일롯 설정..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "주소 전달"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "연락처로 메세지 보내기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h: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 "인쇄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "봉투 인쇄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
 msgstr "주소록으로 복사..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
 msgstr "주소록으로 옮기기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "잘라내기"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "복사"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "붙여 넣기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "현재 보기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2551,7 +2592,7 @@ msgstr ""
 "다시 사용하려면 Evolution을 다시 시작해야 합니다."
 
 #. 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 "모든 분류"
@@ -2585,8 +2626,6 @@ msgid "Car Phone"
 msgstr "카폰"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "분류"
 
@@ -2595,7 +2634,7 @@ msgid "Company Phone"
 msgstr "회사 전화"
 
 #: 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 "전자메일"
 
@@ -2647,6 +2686,7 @@ msgid "Manager"
 msgstr "관리자"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "휴대 전화"
 
@@ -2655,7 +2695,7 @@ msgid "Nickname"
 msgstr "별명"
 
 #: 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 "메모"
 
@@ -2721,17 +2761,17 @@ msgid "Web Site"
 msgstr "웹 사이트"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr "너비"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr "높이"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr "촛점이 있는 지"
 
@@ -2784,11 +2824,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "어댑터"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "선택됨"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "커서가 있는 지"
 
@@ -2804,7 +2844,7 @@ msgstr "지도"
 
 # List는 여기서 Mailing List를 말한다
 #: 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 "리스트 구성원"
 
@@ -2826,6 +2866,7 @@ msgid "Video Conferencing"
 msgstr "화상 회의"
 
 #: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
 msgstr "전화"
 
@@ -2842,27 +2883,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 "블로그"
 
-#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "personal"
 msgstr "개인"
 
-#: addressbook/gui/widgets/eab-contact-display.c:516
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "직함"
 
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "홈페이지"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "성공했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2870,92 +2911,92 @@ msgstr "성공했습니다"
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "저장고가 연결되지 않았습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "권한이 거부되었습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "연락처를 찾을 수 없습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "연락처 ID가 이미 있습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "프로토콜이 지원되지 않습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "취소됨"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "인증이 실패했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "인증이 필요합니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS를 사용할 수 없습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "주소록이 없습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "다른 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "바뀐 부분을 저장하시겠습니까?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "버리기(_D)"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "목록을 더하는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "연락처를 더하는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "목록을 고치는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "연락처를 고치는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "목록을 지우는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "연락처를 지우는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2964,7 +3005,7 @@ msgstr ""
 "연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
 "정말로 이 연락처를 전부 여시겠습니까?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2973,51 +3014,51 @@ msgstr ""
 "%s이(가) 이미 존재합니다\n"
 "이 파일을 덮어 쓰시겠습니까?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "덮어 쓰기"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "%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 "카드.vcf"
 
 # 파일 이름
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "목록"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "연락처 이동"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "연락처 복사"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "연락처 이동"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "연락처 복사"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr "어디로 갈지 주소록을 선택하십시오."
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "여러 개 VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s에 대한 VCard"
@@ -3053,33 +3094,30 @@ msgstr "주소를 기존 연락처 \"%s\"에 더합니다"
 msgid "Querying Address Book..."
 msgstr "주소록 질의중입니다..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "연락처 정보 고침"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "전자메일 주소 합침"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "그리고 기타 연락처 %d개."
-
-#: 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 "그리고 기타 연락처 1개."
+msgid_plural "and %d other contacts."
+msgstr[0] "그리고 기타 연락처 1개."
 
-#: 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 "VCard 자세히 보기"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "VCard 간단히 보기"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "주소록에 저장"
 
@@ -3092,19 +3130,19 @@ msgid "GTK Tree View"
 msgstr "GTk 트리 뷰"
 
 # 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow 테스트"
 
 # 테스트 프로그램
-#: 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 "reflow canvas item을 테스트합니다"
 
@@ -3230,7 +3268,7 @@ msgstr "여백"
 msgid "Number of columns:"
 msgstr "열 수:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "옵션"
 
@@ -3410,7 +3448,7 @@ msgid "Unnamed List"
 msgstr "이름 없는 목록"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "열쇠글을 입력하십시오"
 
@@ -3488,7 +3526,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution 작업 컴포넌트"
 
 #: 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"
@@ -3537,25 +3575,25 @@ msgstr "연기할 시간 (분)"
 msgid "_Edit appointment"
 msgstr "약속 편집(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "열기"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr "없애기"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr "모두 없애기"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "설명이 없습니다."
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3568,13 +3606,13 @@ msgstr ""
 "시작: %s\n"
 "끝: %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 "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: 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"
@@ -3587,7 +3625,7 @@ msgstr ""
 "보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: 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 "
@@ -3604,7 +3642,7 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: 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 "이 메세지를 다시 보지 않습니다."
 
@@ -3777,9 +3815,9 @@ msgstr "위치에 포함"
 msgid "Unmatched"
 msgstr "맞지 않음"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "달력"
 
@@ -3801,7 +3839,7 @@ msgstr "다음보다 오래된 행사 지우기:"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: 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 "일"
 
@@ -3811,12 +3849,8 @@ msgstr "%Y년 %b %-d일 %A"
 
 #. 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 "%b %-d일 (%a)"
 
@@ -3838,72 +3872,72 @@ msgstr "%Y년 %b %-d일"
 msgid "%d %B"
 msgstr "%b %-d일"
 
-#: 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 "'%s' 달력을 지우게 됩니다. 정말로 계속 하시겠습니까?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "새 약속"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "새 모임"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "새 하루 종일 약속"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "하루 종일 약속(_D)"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "새 달력"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "달력(_A)"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: 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 "행사와 회의를 만드는 데 달력 '%s'을(를) 열 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 회의를 만드는 데 쓸 수 있는 달력이 없습니다"
 
@@ -3933,10 +3967,6 @@ msgstr "주별 보기"
 msgid "Month View"
 msgstr "월별 보기"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "목록 보기"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "달력을 여는 중에 오류가 발생했습니다"
@@ -3954,16 +3984,16 @@ msgstr "달력을 열 허가가 거부되었습니다"
 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 "`%s'에 있는 폴더를 열 수가 없습니다"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "달력에 보여줄 URI"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "보여줄 뷰의 종류"
 
@@ -4033,11 +4063,11 @@ msgstr "dialog1"
 msgid "extra times every"
 msgstr "번, 주기:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "시간"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "분"
 
@@ -4061,11 +4091,11 @@ msgstr "기본"
 msgid "Date/Time:"
 msgstr "날짜/시각:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "메세지 표시"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "소리 연주"
 
@@ -4073,17 +4103,17 @@ msgstr "소리 연주"
 msgid "Reminders"
 msgstr "미리 알림"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "프로그램 실행"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 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 "전자메일 보내기"
 
 #: 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 "요약:"
@@ -4114,7 +4144,7 @@ msgid "hour(s)"
 msgstr "시간"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "분"
 
@@ -4124,8 +4154,8 @@ msgstr "약속의 시작"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr "사용"
 
@@ -4139,19 +4169,19 @@ msgstr "지우지 않기"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr "사용 않기"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr "사용"
 
@@ -4175,7 +4205,7 @@ msgstr "30분"
 msgid "60 minutes"
 msgstr "60분"
 
-#: 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 "알림"
 
@@ -4200,7 +4230,7 @@ msgid "Days"
 msgstr "일"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "사용(_N)"
 
@@ -4297,7 +4327,7 @@ msgid "Wednesday"
 msgstr "수요일"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "근무 주"
 
@@ -4343,7 +4373,6 @@ msgid "_Fri"
 msgstr "금(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "일반(_G)"
 
@@ -4440,7 +4469,7 @@ msgstr ""
 "입력한 설정 사항을 저장하려면 \"적용\" 단추를 누르십시오."
 
 #: 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 "새 작업 목록"
 
@@ -4600,33 +4629,33 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: 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 "부터 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: 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 " (완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: 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 "완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: 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 " (기한 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: 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 "기한 "
 
@@ -4663,8 +4692,9 @@ msgstr "일지 항목 - %s"
 msgid "No summary"
 msgstr "요약 없음"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
@@ -4678,31 +4708,18 @@ msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버�
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "받을 곳을 열 수 없습니다"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr "받을 %s을 선택하십시오"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-msgid "calendar"
-msgstr "달력"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-msgid "task list"
-msgstr "작업 목록"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4733,20 +4750,23 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "정말로 이 제목없는 일지 항목 지우시겠습니까?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "정말 약속 %d개를 지우시겠습니까?"
+#, 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] "정말 약속 %d개를 지우시겠습니까?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "정말 작업 %d개를 지우시겠습니까?"
+#: 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] "정말 작업 %d개를 지우시겠습니까?"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "정말 일지 항목 %d개를 지우시겠습니까?"
+#: 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] "정말 일지 항목 %d개를 지우시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
 #: calendar/gui/dialogs/delete-error.c:52
@@ -4815,7 +4835,7 @@ msgstr "대리인:"
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "약속"
 
@@ -4888,8 +4908,6 @@ msgstr "달력:"
 
 #: 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 "분류"
 
@@ -4938,17 +4956,12 @@ msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
 #. 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:774
-#: 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:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5008,13 +5021,13 @@ msgid "Member"
 msgstr "구성원"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "초대장"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
@@ -5191,7 +5204,7 @@ msgid "_No recurrence"
 msgstr "반복 없음(_N)"
 
 #: 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 "지우기(_R)"
 
@@ -5234,7 +5247,7 @@ msgstr ""
 "\n"
 "바뀐 내용을 저장하시겠습니까?"
 
-#: 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 "바뀐 내용 버리기(_D)"
 
@@ -5243,6 +5256,26 @@ msgstr "바뀐 내용 버리기(_D)"
 msgid "Save Event"
 msgstr "행사 저장"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "가져오기 선택"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr "받을 %s을 선택하십시오"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "달력"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "작업 목록"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "회의 정보를 만들었습니다. 보내시겠습니까?"
@@ -5272,39 +5305,39 @@ msgstr "% 완료(_C)"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "완료됨"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
 msgstr "높음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "진행중"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
 msgstr "낮음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
 msgstr "보통"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "시작 안함"
 
@@ -5318,7 +5351,8 @@ msgid "Undefined"
 msgstr "정의안됨"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "완료된 날짜(_D):"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5361,9 +5395,9 @@ msgstr "'%s'의 작업을 열 수 없습니다."
 msgid "Con_fidential"
 msgstr "비밀(_F)"
 
-#: 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 "설명:"
 
@@ -5372,11 +5406,13 @@ msgid "Folder:"
 msgstr "폴더:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "시작 날짜(_R):"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "마감 날짜(_D):"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5430,133 +5466,109 @@ msgid "Weekly"
 msgstr "매주"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d 일"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1일"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d주"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1주"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d시간"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1시간"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d분"
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1분마다"
-
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d초"
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1초"
-
-#: calendar/gui/e-alarm-list.c:477
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 일"
+
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d주"
+
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d시간"
+
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d분"
+
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d초"
+
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "알 수 없는 동작 수행"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s 약속 시작 전"
 
-#: 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 약속 시작 후"
 
-#: 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"
 
-#: 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 약속 끝나기 전"
 
-#: 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 약속 끝난 후"
 
-#: 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"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s (%s)"
 
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: 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"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "공개"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "개인"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "비밀"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "설명"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "날짜"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "시작 날짜"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "요약"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "색상"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "컴포넌트"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "약속 없음"
@@ -5592,143 +5604,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 "예"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "아니오"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "반복됨"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "예약됨"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "선택한 오브젝트를 지우는 중입니다"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "오브젝트를 업데이트하는 중입니다"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "새 약속(_A)..."
-
-# event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "새 하루 종일 행사(_E)"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "새 모임"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "새 작업"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "인쇄(_P)..."
-
-#: 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 "붙여 넣기(_P)"
-
-#: 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 "오늘로 이동(_T)"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "날짜로 이동(_G)..."
-
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "약속 있음/없음 정보 게시(_P)"
-
-#: 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:740 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "열기(_O)"
-
-#: 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:742 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:128
-msgid "_Save As..."
-msgstr "다른 이름으로 저장(_S)..."
-
-#: 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 "잘라내기(_U)"
-
-#: 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 "복사(_C)"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "모임 일정(_S)..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "iCalendar로 전달(_F)..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "이 경우를 지웁니다(_O)"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "모든 경우를 지웁니다(_A)"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "설정(_S)..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5773,32 +5681,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 "선택한 오브젝트를 지우는 중입니다"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "오브젝트를 업데이트하는 중입니다"
+
+#: 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 "열기(_O)"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: 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 "다른 이름으로 저장(_S)..."
+
+#: 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 "인쇄(_P)..."
+
+#: 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 "잘라내기(_U)"
+
+#: 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 "복사(_C)"
+
+#: 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 "붙여 넣기(_P)"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선택한 작업을 마친 작업으로 표시(_M)"
 
-#: 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 "선택한 작업 지우기(_D)"
 
-#: 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 "작업을 더하려면 누르십시오"
 
@@ -5807,55 +5768,111 @@ msgstr "작업을 더하려면 누르십시오"
 msgid "% Complete"
 msgstr "% 완료"
 
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "알림"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
 msgstr "완료"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "완료 날짜"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "마감 날짜"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "지리학적 위치"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "우선순위"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "시작 날짜"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "작업 정렬"
 
-#: 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 "새 약속(_A)..."
+
+# event -> 행사, Microsoft Office XP 참고
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "새 하루 종일 행사(_E)"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "새 모임"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "새 작업"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "글타래 선택(_T)"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "선택(_S)..."
+
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "약속 있음/없음 정보 게시(_P)"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "폴더로 복사..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "폴더로 옮기기(_V)..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "모임 일정(_S)..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "iCalendar로 전달(_F)..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "이 경우를 지웁니다(_O)"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "모든 경우를 지웁니다(_A)"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "오늘로 이동(_T)"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "날짜로 이동(_G)..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "설정(_S)..."
 
 #. 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 "%Y/%m/%d (%a) %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"
@@ -5879,33 +5896,26 @@ msgstr "%02i분 단위"
 
 #. 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 "%b %-d일 %A"
 
 #. 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 "%m %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "오후"
@@ -5914,114 +5924,99 @@ msgstr "오후"
 msgid "Yes. (Complex Recurrence)"
 msgstr "예. (복잡한 반복)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "매일"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "%d일마다"
+msgid_plural "Every %d days"
+msgstr[0] "매일"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "매주"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "%d주마다"
+msgid_plural "Every %d weeks"
+msgstr[0] "매주"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "매주 "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "%d주마다 "
+msgid_plural "Every %d weeks on "
+msgstr[0] "매주 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " 그리고 "
 
 # FIXME - hard to translate UI + string based on English grammar
 # "The <monthday> day of " (like The 28th day of June)
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s "
 
 # FIXME - hard to translate UI + string based on English grammar
 # "The <dayofmonth> <dayofweek> of" (like The 13th Friday)
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "매달"
+msgid_plural "every %d months"
+msgstr[0] "매달"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "%d달마다"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "매년"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "%d년마다"
+msgid_plural "Every %d years"
+msgstr[0] "매년"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " 전체 %d번"
+#: 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] " 전체 %d번"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", 끝: "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>시작:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>끝:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>완료됨:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>기한:</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 정보"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "모르는 사람"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6029,322 +6024,322 @@ msgstr ""
 "<br> 다음 정보를 다시 확인하시고, 아래의 메뉴에서 어떤 동작을 할 지 선택하십"
 "시오."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>없음</i>"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "위치:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "상태:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "수락"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "거부"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "동작을 고르십시오:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "업데이트"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "확인"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "수락"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "잠정적으로 수락"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "거부"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "약속 있음/없음 정보 보내기"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "업데이트 응답 상태"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "가장 최근 정보 보내기"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>님이 회의 정보를 게시했습니다."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "모임 정보"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>님이 회의에 %s님의 참석을 요청했습니다."
 
-#: 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>님이 회의에 참석하시기를 요청했습니다."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "모임 제안"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>님이 기존 회의에 참석하고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "모임 업데이트"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>님이 가장 최근의 회의 정보를 받고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "모임 업데이트 요청"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>님이 회의 요청에 회신했습니다."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "모임 회신"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>님이 회의를 취소했습니다."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "모임 취소"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>님이 이해하기 어려운 메세지를 보냈습니다."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "잘못된 회의 메세지"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>님이 작업 정보를 게시했습니다."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>님이 %s님에게 작업을 수행하길 요청하셨습니다."
 
-#: 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>님이 작업을 수행하길 요청하셨습니다."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "작업 제안"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>님이 기존 작업에 참여하고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "작업 업데이트"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>님이 가장 최근의 작업 정보를 받고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "작업 업데이트 요청"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>님이 작업 할당에 회신했습니다."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "작업 회신"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>님이 작업을 취소했습니다."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "작업 취소"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "잘못된 작업 메세지"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: 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>이(가) 약속 있음/없음 정보를 게시했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "약속 있음/없음 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: 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>이(가) 약속 있음/없음 정보를 요청했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "약속 있음/없음 요청"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: 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>이(가) 약속 있음/없음 요청에 회신했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "약속 있음/없음 회신"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "틀린 약속 있음/없음 메세지"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "메세지의 형식이 올바르지 않은 것으로 보입니다"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "이 메세지에는 지원하지 않는 요청만 들어 있습니다."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "첨부에 올바른 달력 메세지가 없습니다"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "달력 파일을 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "업데이트 마침\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 "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: 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 "오브젝트가 잘못되었고 업데이트할 수 없습니다\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 "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
 
-#: 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 "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\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 "CORBA 시스템에 오류가 있습니다\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "오브젝트를 찾을 수 없습니다\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 "달력을 업데이트할 올바른 권한이 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "지우기를 끝마쳤습니다"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\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 "항목을 보낼 수 없습니다!\n"
 
@@ -6472,10 +6467,6 @@ msgstr "%Y년 %b %-d일 %A"
 
 #. 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
@@ -6484,10 +6475,6 @@ msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6573,12 +6560,12 @@ msgstr "우선 순위:"
 msgid "Web Page:"
 msgstr "웹 페이지:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "URL %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"
@@ -6588,7 +6575,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"
@@ -6598,12 +6585,12 @@ msgstr ""
 "다음에 대한 작업 벡엔드가 비정상적으로 죽었습니다:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6612,48 +6599,52 @@ msgstr ""
 "%s 여는 데 오류가 밝생했습니다:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: calendar/gui/gnome-cal.c:1751
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "%s의 작업을 읽어들이는 중입니다"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "%s의 작업을 읽어들이는 중입니다"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 "다음에 대한 달력 벡엔드가 비정상적으로 죽었습니다:\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"다음에 대한 작업 벡엔드가 비정상적으로 죽었습니다:\n"
+"%s"
+
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -6674,44 +6665,46 @@ msgid "February"
 msgstr "2월"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "날짜로 가기"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "1월"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "7월"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "6월"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "3월"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "5월"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "11월"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "10월"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "모든 텍스트 선택"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "9월"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "오늘로 가기(_G)"
+#, fuzzy
+msgid "_Select Today"
+msgstr "폴더 선택"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6804,7 +6797,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "생일 및 기념일"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "웹"
 
@@ -6961,81 +6954,81 @@ msgid "Sa"
 msgstr "토"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "선택된 날(%Y년 %b %-d일 (%a))"
 
-#: 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 "%b %-d일 (%a)"
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%Y년 %-d일 (%a)"
 
-#: 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 "%Y년 %b %-d일 (%a)"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "선택된 주 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "선택된 달 (%Y년 %b)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "선택한 년도 (%Y년)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "작업"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "퍼센트 완료: %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 "분류: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "연락처:"
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "인쇄 미리 보기"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "항목 인쇄"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "인쇄 설정"
 
@@ -7044,37 +7037,37 @@ msgstr "인쇄 설정"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "작업 목록 '%s'을(를) 지웁니다. 정말로 계속하시겠습니까?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "새 작업"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "새 작업 목록"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "작업 목록(_T)"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: 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 "행사와 회의를 만드는 데 쓸 작업 목록 '%s'을(를) 열 수 없습니다"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
@@ -8721,7 +8714,7 @@ msgstr "캐시 경로를 만들 수 없습니다"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "캐시 항목을 지울 수 없습니다: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8732,7 +8725,7 @@ msgstr ""
 "이 서버에 대해 향후 작업은 네트워크에 다시 연결했을 때\n"
 "다시 수행됩니다."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8743,7 +8736,7 @@ msgstr ""
 "%s\n"
 "이 폴더에 바뀐 사항이 동기화되지 않을 것입니다."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "서버와 다시 동기화하는 중입니다"
 
@@ -8760,7 +8753,7 @@ msgstr "오프라인 모드를 위한 새 메세지를 다운로드하는 중입
 msgid "Preparing folder '%s' for offline"
 msgstr "오프라인 모드를 위한 '%s' 폴더를 준비하는 중입니다"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "이 작업을 마치려면 온라인으로 실행해야 합니다"
 
@@ -8875,34 +8868,34 @@ msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
 msgid "Performing query on unknown header: %s"
 msgstr "알 수 없는 헤더에 대해 질의를 수행하는 중입니다: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "지원하지 않는 동작: 메세지 추가: %s"
 
-#: camel/camel-folder.c:1169
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "지원되지 않는 동작: 표현식으로 찾기: %s"
 
-#: camel/camel-folder.c:1209
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "지원되지 않는 동작: uid로 찾기: %s"
 
-#: camel/camel-folder.c:1327
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "메세지 옮기는 중입니다"
 
-#: camel/camel-folder.c:1327
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "메시지 복사하는 중입니다"
 
-#: camel/camel-folder.c:1581
+#: camel/camel-folder.c:1589
 msgid "Learning junk and/or non junk message(s)"
 msgstr "정크메일과 정크메일이 아닌 메세지를 학습합니다"
 
-#: camel/camel-folder.c:1610
+#: camel/camel-folder.c:1618
 msgid "Filtering new message(s)"
 msgstr "새 메세지 거르는 중입니다"
 
@@ -8937,7 +8930,7 @@ 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-ops.c:697
-#: mail/mail-send-recv.c:593
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
 msgstr "취소됨."
 
@@ -9313,7 +9306,7 @@ msgstr "참조한 증명서가 만료된 증명서입니다."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "서버에서 보낸 인증 응답이 틀렸습니다."
 
@@ -9506,7 +9499,7 @@ msgstr "처리 오류"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "서명자: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "폴더를 얻을 수 없습니다: 이 저장고에 잘못된 동작입니다"
 
@@ -9515,20 +9508,21 @@ msgstr "폴더를 얻을 수 없습니다: 이 저장고에 잘못된 동작입�
 msgid "Cannot create folder `%s': folder exists"
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "폴더를 만들 수 없습니다: 이 저장고에 잘못된 동작입니다"
 
-#: 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 "폴더를 지울 수 없습니다: %s: 잘못된 동작"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1079
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "휴지통"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1083
+#: 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 "정크메일"
@@ -9802,50 +9796,51 @@ msgstr "이 서버의 받은 편지함에 있는 새 메세지에 거르게를 �
 msgid "Automatically synchronize remote mail locally"
 msgstr "로컬에서 자동으로 원격 메일과 동기화합니다"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP 서버 이름:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "주소록"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "찾기 기준:"
+#: 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 "Novell GroupWise 서버에 접근하는 용도"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "열쇠글"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버에 연결합니다."
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
 msgstr "확인목록"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2912
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "작업이 취소되었습니다"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2915
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
@@ -9903,12 +9898,12 @@ msgstr "폴더가 지워지고 서버에서 다시 만들어졌습니다."
 msgid "Scanning for changed messages"
 msgstr "바뀐 메세지를 검사합니다"
 
-#: 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 "메세지를 가져올 수 없습니다: %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
@@ -9924,25 +9919,25 @@ msgstr ""
 "메세지를 얻을 수 없습니다: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "그런 메세지 없음"
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "이 메시지는 현재 보여줄 수가 없습니다"
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "새 메세지의 목록 정보를 가져오는 중입니다"
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 응답에서 메세지 본문을 찾을 수 없습니다."
 
@@ -10015,18 +10010,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP서버에 메일을 읽고 저장."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 서버 %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 서비스 (사용자: %s, 위치: %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
@@ -10036,14 +10031,14 @@ msgstr "IMAP 서비스 (사용자: %s, 위치: %s)"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s에 연결할 수 없습니다 (포트 %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을 사용할 수 없습니다"
 
-#: 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
@@ -10051,49 +10046,49 @@ msgstr "SSL을 사용할 수 없습니다"
 msgid "Connection cancelled"
 msgstr "연결이 취소됨"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %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 확장 기능을 지원하지 않습니다."
 
-#: 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 협상이 실패했습니다"
 
-#: 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 "\"%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 서버 %s은(는) 요청한 인증형식 %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 "%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 "%s %s@%s에 대한 IMAP 열쇠글을 입력하십시오"
 
-#: camel/providers/imap/camel-imap-store.c:1324
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "열쇠글을 입력하지 않았습니다."
 
-#: 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"
@@ -10104,13 +10099,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 "%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 ""
+"폴더 \"%s\"의 이름이 올바르지 않습니다; \"%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
@@ -10118,19 +10121,12 @@ msgstr "%s(이)라는 폴더가 없습니다"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다."
 
-#: camel/providers/imap/camel-imap-store.c:2051
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-"폴더 \"%s\"의 이름이 올바르지 않습니다; \"%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 "상위 폴더를 알 수 없습니다: %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 "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다"
 
@@ -10165,20 +10161,20 @@ msgid "Index message body data"
 msgstr "색인 메세지 본문 데이터"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: 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:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "메일함:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10238,7 +10234,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"
@@ -10287,8 +10283,8 @@ msgstr "폴더 요약 파일 `%s'을(를) 지울 수 없습니다: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "폴더 색인 파일 `%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 "폴더 메타 파일 `%s'을(를) 지울 수 없습니다: %s"
@@ -10353,28 +10349,28 @@ msgstr "폴더 `%s'을(를) 지울 수 없습니다: %s"
 msgid "not a maildir directory"
 msgstr "메일폴더 디렉토리가 아닙니다"
 
-#: camel/providers/local/camel-maildir-store.c:383
+#: 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 "`%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 "메일 디렉토리 경로를 열 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "폴더의 일관성을 확인 중입니다"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "새 메세지를 확인하는 중입니다"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10422,7 +10418,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "메세지 만들기가 실패했습니다: 메일함이 깨졌습니다?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 msgid "Cannot create a folder by this name."
 msgstr "이 이름의 폴더를 만들 수 없습니다."
 
@@ -10452,30 +10448,30 @@ msgstr "`%s'이(가) 일반 파일이 아닙니다."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "폴더 `%s'이(가) 비어 있지 않습니다. 지우지 않습니다."
 
-#: 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 "'%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 "폴더를 만들 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr "폴더가 이미 있습니다"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "새 폴더의 이름이 올바르지 않습니다."
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "`%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 "'%s'을(를) %s(으)로 이름을 바꿀 수 없습니다: %s"
@@ -10519,7 +10515,7 @@ msgstr "원본 폴더 %s을(를) 닫을 수 없습니다: %s"
 msgid "Could not close temp folder: %s"
 msgstr "임시 폴더를 닫을 수 없음: %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 "폴더 이름을 바꿀 수 없습니다: %s"
@@ -10850,46 +10846,46 @@ msgstr "뉴스 저장고의 폴더의 이름을 바꿀 수 없습니다."
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "뉴스 저장고의 폴더를 지울 수 없습니다: 대신에 구독 해제하십시오."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "연결 오류: %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 "그런 폴더가 없습니다: %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 "그룹을 받아 올 수 없습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr "메세지를 가져올 수 없습니다: 지정하지 않은 오류"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP 명령이 실패했습니다: %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: 새 메시지를 검사하는 중입니다"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "알 수 없는 서버 응답: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "사용자 취소"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "작업이 실패했습니다: %s"
@@ -10936,7 +10932,7 @@ msgstr "%s일 뒤에 지우기"
 msgid "Disable support for all POP3 extensions"
 msgstr "POP3 확장 기능을 모두 끕니다"
 
-#: 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"
 
@@ -11024,7 +11020,7 @@ msgid "No such folder `%s'."
 msgstr "`%s'(이)라는 폴더가 없습니다."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "센드메일"
 
@@ -11076,12 +11072,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail을 통한 메일 배달"
 
-#: 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 "SMTP를 사용해서 원격 메일허브로 연결해 메일을 보냅니다.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11345,44 +11342,44 @@ msgstr "QUIT 명령이 실패했습니다: %s"
 msgid "QUIT command failed"
 msgstr "QUIT 명령이 실패했습니다"
 
-#: 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 "첨부"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
 msgstr "첨부파일 목록에서 선택한 항목을 지웁니다"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "첨부파일 더하기..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "%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 "%s 파일을 첨부할 수 없습니다: 일반 파일이 아닙니다"
@@ -11404,21 +11401,21 @@ msgstr "MIME 형식:"
 msgid "Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시를 권합니다"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
 msgstr "메일을 작성하기 전에 계정을 설정해야 합니다."
 
 # post -> 게시, Microsoft Office XP 참고
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "게시물 수신자"
 
 # post -> 게시, Microsoft Office XP 참고
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "메세지를 올릴 폴더를 선택하십시오."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "주소록을 보려면 누르십시오"
 
@@ -11429,45 +11426,45 @@ msgstr "주소록을 보려면 누르십시오"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "회신 주소:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "보낸 사람:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "제목:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "받는 사람:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "메세지를 받을 사람을 입력하십시오"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "참조:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "메세지의 사본을 받을 사람의 주소를 입력하십시오"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11478,11 +11475,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "게시 위치:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 
@@ -11490,14 +11487,14 @@ msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 msgid "Attach file(s)"
 msgstr "파일 첨부"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "나가는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
 "았습니다"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11505,7 +11502,7 @@ msgstr ""
 "보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
 "습니다"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11514,30 +11511,30 @@ msgstr ""
 "%s 파일을 읽는 중 오류 발생:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "파일이 있습니다, 덮어쓰시겠습니까?"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "파일 저장 중 오류 발생: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "파일을 읽는 데 오류 발생: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "파일 접근하는 데 오류 발생: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "편집기에서 메세지를 가져올 수 없습니다"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11546,7 +11543,7 @@ msgstr ""
 "파일에서 찾을 수 없습니다: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11555,7 +11552,7 @@ msgstr ""
 "파일을 잘라낼 수 없습니다: %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"
@@ -11564,7 +11561,7 @@ msgstr ""
 "파일 디스크립터를 복사할 수가 없습니다: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11573,7 +11570,7 @@ msgstr ""
 "메세지를 자동 저장하는데 오류가 발생했습니다: %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?"
@@ -11581,7 +11578,7 @@ msgstr ""
 "Ximian Evolution의 이전 세션에서 저장하지 않은 파일을 발견했습니다.\n"
 "이 파일을 복구하시겠습니까?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11592,46 +11589,46 @@ msgstr ""
 "\n"
 "바뀐 내용을 저장하시겠습니까?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
 msgid "Untitled Message"
 msgstr "제목 없는 메세지"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "경고: 바뀐 메세지"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "파일 열기"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "서명:"
-
-#: 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 "자동으로 만들기"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "서명:"
+
+#: 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>개의 파일이 첨부되었습니다"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
 
-#: 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 "첨부 모음 보이기 (여기에 첨부를 끌어옵니다)(_A)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "메일 메세지를 작성합니다"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11639,7 +11636,7 @@ msgstr ""
 "메일 작성 창을 만들 수 없습니다:\n"
 "주소 선택 컨트롤을 활성화할 수 없습니다."
 
-#: 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"
@@ -11651,7 +11648,7 @@ msgstr ""
 "올바른 버전의 gtkhtml과 libgtkhtml이\n"
 "설치되었는 지 확인하십시오.\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."
@@ -11659,7 +11656,7 @@ msgstr ""
 "메일 작성 창을 만들 수 없습니다:\n"
 "HTML 편집기 컴포넌트를 활성화할 수 없습니다."
 
-#: 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>"
@@ -11822,16 +11819,12 @@ msgstr "동기화 분류:"
 
 #. 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 "%Y/%m/%d (%a) %p %I:%M"
 
 #. 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 "%Y/%m/%d (%a) %H:%M"
@@ -11883,31 +11876,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %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 "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -11918,119 +11903,99 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%p %I"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1초 전"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d초 전"
+msgid_plural "%d seconds ago"
+msgstr[0] "1초 전"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "일분 전"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d분 전"
+msgid_plural "%d minutes ago"
+msgstr[0] "일분 전"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "한시간 전"
+msgid_plural "%d hours ago"
+msgstr[0] "한시간 전"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d시간 전"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "하루 전"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d일 전"
+msgid_plural "%d days ago"
+msgstr[0] "하루 전"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "한주 전"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d주 전"
+msgid_plural "%d weeks ago"
+msgstr[0] "한주 전"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "한달 전"
+msgid_plural "%d months ago"
+msgstr[0] "한달 전"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d달 전"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1년 전"
+msgid_plural "%d years ago"
+msgstr[0] "1년 전"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d년 전"
-
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "날짜를 선택해야 합니다."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<날짜를 선택할려면 여기를 누르십시오>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "현재"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "비교할 시각을 선택하십시오"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "거르게 규칙"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "파일 이름을 지정해야 합니다."
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "파일 `%s'이(가) 없거나 일반 파일이 아닙니다."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "파일을 선택하십시오"
 
-# FIXME - hard to translate UI + string based on English grammar
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "동작 선택"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>기한:</b> "
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "폴더를 지정해야 합니다."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "폴더 선택"
 
@@ -12044,23 +12009,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 "중요"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "할 일"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "나중에"
 
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "테스트"
 
@@ -12068,59 +12033,63 @@ msgstr "테스트"
 msgid "You must name this filter."
 msgstr "이 거르게에 이름을 주어야 합니다."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "규칙 이름: "
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "제목 없음"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "조건 선택"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>기한:</b> "
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "동작 선택"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "모든 조건이 다 충족될 때"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "어떤 조건이라도 충족될 때"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "받는 메일"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "보내는 메일"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "비교할 시각:"
+msgid "    "
+msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "거르게 편집"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "거르게 규칙"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "가상폴더 편집"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "가상 폴더 원본"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "비교할 시각:"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "들어오는 것"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "나가는 것"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12128,7 +12097,7 @@ msgstr ""
 "메세지 시각을 지정한 날짜의 오전 12:00를\n"
 "기준으로 비교합니다."
 
-#: 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."
@@ -12136,7 +12105,7 @@ msgstr ""
 "메세지 시각을 거르는 시각까지 얼마나 지났나를\n"
 "기준으로 비교합니다."
 
-#: 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."
@@ -12144,59 +12113,51 @@ msgstr ""
 "메세지 시각을 거르는 현재 시각을\n"
 "기준으로 비교합니다."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "가상 폴더"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "현재 시각까지의 상대적인 시간"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "전에"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "달"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "초"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "지정된 폴더만"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "현재 시각"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "지정하는 시각"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "가상 폴더 원본"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "주"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "모든 활성화된 원격 폴더에"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "모든 로컬 폴더와 활성화된 원격 폴더에"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "모든 로컬 폴더에"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "연도"
 
@@ -12376,8 +12337,9 @@ msgid "Move to Folder"
 msgstr "폴더로 이동"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "쉘 명령으로 메세지 파이프"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "프로그램을 끝냅니다"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12414,23 +12376,24 @@ msgstr "더 큰 값 리턴"
 msgid "returns less than"
 msgstr "더 작은 값 리턴"
 
-#: 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 "프로그램 실행:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "점수"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "보낸 사람"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "상태 설정"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "쉘 명령"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "크기 (kB)"
@@ -12457,9 +12420,9 @@ msgstr "시작함"
 msgid "Stop Processing"
 msgstr "처리 중지"
 
-#: 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 "제목"
@@ -12468,17 +12431,13 @@ msgstr "제목"
 msgid "Unset Status"
 msgstr "상태 설정 없애기"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "규칙 이름 '%s'이(가) 고유한 이름이 아닙니다. 다른 이름을 선택하십시오."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "규칙"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "규칙 더하기"
 
@@ -12490,8 +12449,9 @@ msgstr "규칙 편집"
 msgid "Rule name"
 msgstr "규칙 이름"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "점수 규칙"
 
 # FIXME - hard to translate UI + string based on English grammar
@@ -12530,15 +12490,20 @@ msgstr "제목에 포함"
 msgid "Subject does not contain"
 msgstr "제목에 포함하지 않음"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "가상 폴더"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "이 가상폴더의 이름을 지정해야 합니다."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "최소한 한 개의 폴더를 원본으로 지정해야 합니다."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "가상 폴더 원본"
 
@@ -12587,8 +12552,8 @@ msgstr "Evolution 메일 폴더 보기"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 메일 기본 설정 컨트롤"
 
-#: 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 "메일"
@@ -12597,53 +12562,50 @@ msgstr "메일"
 msgid "Mail Accounts"
 msgstr "메일 계정"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "정말로 이 계정을 지우시겠습니까?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "지우지 않음"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[기본값]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "계정 이름"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
 msgid "Unnamed"
 msgstr "이름없음"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "올바른 스크립트 이름을 지정해야 합니다."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[스크립트]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "언어"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "스크립트 서명 더하기"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "서명 더하기(_A)"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "서명"
 
@@ -12699,7 +12661,7 @@ msgstr ""
 "이 계정의 임시 보관함 폴더를 열 수 없습니다.\n"
 "기본적인 임시 보관함 폴더를 사용하시겠습니까?"
 
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "찾은 것에서 가상 폴더 만들기(_V)..."
 
@@ -12733,8 +12695,8 @@ msgstr "<폴더를 고를려면 여기를 누르십시오>"
 msgid "Create New Folder"
 msgstr "새 폴더 만들기"
 
-#: 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 "폴더 만들 곳을 지정하십시오:"
@@ -12744,117 +12706,137 @@ msgstr "폴더 만들 곳을 지정하십시오:"
 msgid "Folder _name:"
 msgstr "폴더 이름(_N):"
 
-#: 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 "가상 폴더"
 
 # VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
-#: 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 "해당 없음"
 
 #. 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 "받은 편지함"
 
-#: 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 "읽어들이는 중..."
 
-#: mail/em-folder-tree.c:856
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "%s 폴더를 지우는 중입니다"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "%s 폴더를 열기"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "메시지들을 %s(으)로 옮기는 중"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "메시지들을 %s(으)로 복사하는 중"
+
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: mail/em-folder-tree.c:1831
+#: mail/em-folder-tree.c:1950
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "`%s' 폴더를 옮길 수 없습니다: 잘못된 동작"
 
-#: 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-tree.c:1995 mail/em-folder-tree.c:2008
 #: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: mail/em-folder-tree.c:1916
+#: mail/em-folder-tree.c:2035
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%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 "폴더를 만듭니다"
 
-#: mail/em-folder-tree.c:2220
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "폴더를 지울 수 없습니다: %s"
 
-#: mail/em-folder-tree.c:2245
+#: mail/em-folder-tree.c:2372
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "로컬 %s 폴더를 지울 수 없습니다."
 
-#: 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 "정말로 \"%s\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
 
-#: mail/em-folder-tree.c:2261
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" 지우기"
 
-#: mail/em-folder-tree.c:2295
+#: mail/em-folder-tree.c:2422
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "로컬 %s 폴더 이름을 바꿀 수 없습니다."
 
-#: mail/em-folder-tree.c:2304
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" 폴더 이름 바꾸기:"
 
-#: mail/em-folder-tree.c:2306
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "폴더 이름 바꾸기"
 
-#: 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 "\"%s\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
 
-#: 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 "보기(_V)"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
-#: mail/em-folder-tree.c:2382
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "이동(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2386
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: mail/em-folder-tree.c:2389
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "이름 바꾸기(_R)"
 
-#: 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 "등록 정보(_P)..."
 
@@ -12993,7 +12975,7 @@ msgstr "쓰레드에 거르게"
 
 #. default charset used in mail view
 #: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "기본값"
 
@@ -13005,22 +12987,22 @@ msgstr "메세지 인쇄"
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %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 "일치: %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 "서명 없음"
 
-#: 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."
@@ -13028,11 +13010,11 @@ msgstr ""
 "이 메세지에는 서명이 없습니다.  메세지를 보낸 사람이 확실한 지 보장할 수 없습"
 "니다."
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Valid signature"
 msgstr "올바른 서명"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13040,11 +13022,11 @@ msgstr ""
 "이 메세지는 서명되었고 서명이 올바릅니다.  메세지를 보낸 사람은 그 사람이 거"
 "의 확실합니다."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Invalid signature"
 msgstr "잘못된 서명"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13052,11 +13034,11 @@ msgstr ""
 "이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
 "다."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr "올바른 서명, 보낸 사람을 확인할 수 없음"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13064,11 +13046,11 @@ msgstr ""
 "이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
 "할 수 없습니다."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 msgid "Unencrypted"
 msgstr "암호화 안 됨"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -13076,11 +13058,11 @@ msgstr ""
 "메세지를 암호화하지 않았습니다.  이 메세지가 인터넷을 통해 전달되는 동안, 다"
 "른 사람이 메세지 내용을 볼 수도 있습니다."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr "암호화됨, 약함"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13090,11 +13072,11 @@ msgstr ""
 "사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
 "능하지는 않습니다."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted"
 msgstr "암호화됨"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13102,11 +13084,11 @@ msgstr ""
 "메세지가 암호화되어 있습니다.  다른 사람이 이 메세지의 내용을 알아 내기는 어"
 "렵습니다."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr "암호화됨, 강력"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13115,32 +13097,32 @@ msgstr ""
 "메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %b %-d일, %p %l:%M"
 
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "마감 지남:"
 
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %-d일, %p %l:%M까지"
 
 # FIXME - inline의 나은 번역을 찾아보자
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "인라인으로 보기"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
@@ -13149,124 +13131,158 @@ msgstr "숨기기(_H)"
 msgid "Page %d of %d"
 msgstr "%2$d페이지 중 %1$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 "`%s' 가져오는 중"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "외부 본문 부분의 형식이 잘못되었습니다."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 사이트(%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 "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "로컬 파일(%s)을 가리킵니다"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "원격 데이터(%s)을 가리킵니다"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "메세지를 포맷하는 중입니다"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "보낸 사람"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "회신 주소"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "받는이"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "참조"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "숨은 참조"
 
 #. 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 "메일 프로그램"
 
 #. 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 "날짜"
 
-#: 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 첨부"
 
-#: 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 "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: 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 "내부 오류: uid 형식이 잘못되었습니다: %s"
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "지원하지 않는 서명 형식입니다"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Error verifying signature"
 msgstr "서명을 확인하는 중 오류가 발생했습니다"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
 
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "내부 오류: uid 형식이 잘못되었습니다: %s"
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (내부에 포함)"
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "매년"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "매주"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "매달"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13278,23 +13294,23 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: 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 "POP3 UID 캐시를 옮기는 데 실패했습니다: %s"
 
 # folder expand state?
-#: 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 "폴더 상태를 옮기는 데 실패했습니다: %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 "`%s' 디렉토리를 만들 수 없습니다: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "`%s'에 쓸 저장고를 여는 데 실패했습니다: %s"
@@ -13333,33 +13349,33 @@ msgstr "주소록에 더하기(_A)"
 msgid "Open in %s..."
 msgstr "%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 ""
 "이 저장고는 가입을 지원하지 않거나, 가입할 수 있도록 설정하지 않았습니다."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "구독"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "폴더"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
 msgstr "서버를 선택하십시오."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "서버를 선택하지 않았습니다"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13368,25 +13384,25 @@ msgstr ""
 "거르게 정보를 읽어들이는 데 오류가 발생했습니다:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "거르게"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 전달된 메시지 --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "알 수 없는 보낸 이"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d (%a) %H:%M %%+05d에, %%s 쓰기를:"
 
-#: 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"
@@ -13395,7 +13411,7 @@ msgstr ""
 "`%s'에 저장할 수 없습니다\n"
 " %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13404,35 +13420,35 @@ msgstr ""
 "`%s'이(가) 이미 있습니다.\n"
 "덮어쓰시겠습니까?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "메세지"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "오류: `%s'이(가) 있으나 일반 파일이 아닙니다."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "메세지 저장..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "주소 더하기"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "임시 디렉토리를 만들 수가 없습니다: %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 `%"
@@ -13445,7 +13461,7 @@ msgstr ""
 "\n"
 "정말로 이 메세지들을 지우시겠습니까?"
 
-#: 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"
@@ -13514,46 +13530,56 @@ msgid "Default height of the Message Window"
 msgstr "메세지 창의 기본 높이"
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "메세지 창의 기본 높이"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "기본 회신 모양새"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "메세지 작성 창의 기본 너비"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "메세지 창의 기본 너비"
 
-#: 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 "메세지 창의 기본 너비"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "타이프할 때 맞춤법이 틀린 단어에 표시해 줍니다."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "끝날 때 휴지통 폴더를 비웁니다"
 
-#: 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 "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 "캐릿 모드를 켭니다, 이 모드에서는 메일을 읽을 때 커서가 보입니다."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "캐릿 모드 켜기/끄기"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "메세지 목록 창의 높이"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "메세지 목록 창의 높이."
 
-#: 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 "
@@ -13563,15 +13589,19 @@ msgstr ""
 "에서 보노보 컴포넌트 뷰어로 매핑되는 (그놈의 MIME타입 데이터베이스에서) 뷰어"
 "가 내용을 표시하는 데 사용됩니다."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr "꼬리표와 거기에 해당되는 색의 목록"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "계정 목록"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13579,11 +13609,11 @@ msgstr ""
 "Evolution의 메일 컴포넌트에 사용할 계정 목록입니다. 이 목록에는 /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 "사용자 지정 헤더와 그 헤더를 사용할 지 여부의 목록."
 
-#: 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."
@@ -13591,15 +13621,15 @@ msgstr ""
 "Evolution의 메일 컴포넌트에 사용할 꼬리표 목록입니다. 이 목록에는 <이름>:<색"
 "> 형식의 문자열이 들어 있습니다. 색은 HTML 16진수 인코딩을 사용합니다."
 
-#: 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 "보노보 컴포넌트 뷰어가 있는 지 검사할 MIME 타입 목록"
 
-#: 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 "http로 HTML 메세지의 그림을 읽어들입니다"
 
-#: 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 - "
@@ -13609,173 +13639,195 @@ msgstr ""
 "읽어들이지 않습니다 2 - 보낸 사람이 주소록에 들어 있으면 그림을 읽어들입니다 "
 "2 - 항상 네트워크에서 그림을 읽어들입니다"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "거르게 동작 기록"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 거르게 동작을 기록합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "거르게 동작을 기록할 로그 파일"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "거르게 동작을 기록할 로그 파일입니다."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr "메세지 창 기본 높이"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr "메세지 창 기본 너비"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "메세지-표시 모양새 (보통, 헤더 전부, 소스)"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
 msgstr "새 메일 알림 사운드 파일"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "새 메일 알림 종류"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "사용자가 폴더의 지운 메세지를 비우려 할 때 물어봅니다."
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "제목 없는 메세지를 보내려 할 때 물어봅니다."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "사용자가 지운 메세지를 비우려 할 때 물어봅니다"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "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."
 msgstr ""
 "HTML 메세지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
 
-#: 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 "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
 
-#: 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 "원하지 않는 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 "텍스트의 URL을 인식하고 바로가기로 바꿉니다."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr "텍스트의 스마일리를 인식하고 그림으로 바꿉니다."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "받은 메일에 대해 쓰레기 메일 검사를 실행합니다"
 
 # Secret Option
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "ㅂ1ㅁ12 0ㅗㅂ^ㅕL"
 
 # Secret Option
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "ㅂ1ㅁ12 0ㅗㅂ^ㅕL."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "기본으로 HTML 메일 보내기"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "기본으로 HTML 메일을 보냅니다."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "그림 움직임 보이기"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "애니메이션 그림을 애니메이션으로 보입니다."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "메세지 목록에 지워진 메세지를 표시합니다 (취소선을 긋습니다)."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "메세지 목록에 지워진 메세지를 표시합니다"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "\"미리 보기\" 창 보이기"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "\"미리 보기\" 창을 보입니다."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "새 메일이 도착하면 소리를 연주합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "사용자가 사용하려는 새 메일 알림 종류를 지정합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "인라인 맞춤법 검사"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "메세지 창 기본 높이"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "메세지 창 기본 너비"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "터미널 글꼴"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "메일을 표시할 터미널 글꼴"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "메일을 표시할 가변폭 글꼴"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13786,99 +13838,99 @@ msgstr ""
 "리스트가 들어 있습니다. XML 구조의 형식은 &lt;header enabled&gt;입니다 - 헤더"
 "를 메일 보기에서 표시하면 enabled로 설정합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "연관된 메세지를 쓰레드로 만듭니다."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "연관된 메세지를 쓰레드로"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "제목에 따라 메세지 목록을 쓰레드 표시합니다"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "메세지를 읽은 것으로 표시하는 경과 시간"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "메세지를 읽은 것으로 표시하는 경과 시간."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "기본 계정의 UID 문자열."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Spamasssassin 데몬 및 클라이언트 사용"
 
-#: 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 "Spamasssassin 데몬 및 클라이언트를 사용합니다 (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "사용자 설정 글꼴 사용"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "메일을 표시할 때 사용자가 설정한 글꼴을 사용합니다"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr "로컬 스팸 테스트만 사용합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr "로컬 스팸 테스트만 사용합니다 (DNS는 사용하지 않습니다)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "가변폭 글꼴"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "보기/숨은 참조 메뉴 항목이 체크"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "보기/숨은_참조 메뉴 항목이 체크."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "보기/참조 메뉴 항목이 체크"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "보기/참조 메뉴 항목이 체크."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "보기/보낸 사람 메뉴 항목이 체크"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "보기/보낸 사람 메뉴 항목이 체크."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "보기/게시_위치 메뉴 항목이 체크"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "보기/게시_위치 메뉴 항목이 체크."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "보기/회신_주소 메뉴 항목이 체크"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "보기/회신_주소 메뉴 항목이 체크."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13886,11 +13938,11 @@ msgstr ""
 "메세지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 쓰레"
 "드 표시를 할 것인지 여부."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr "spamd를 시작할 포트"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
 msgstr "spamd 포트"
 
@@ -13929,14 +13981,14 @@ msgstr "Elm 메일을 Evolution에 가져오는 중입니다"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "가져오는 중..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
 
@@ -13981,12 +14033,12 @@ msgstr "메일함 가져오기"
 msgid "Scanning %s"
 msgstr "%s 검색하는 중입니다"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "우선순위 거르게 \"%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"
@@ -14010,7 +14062,7 @@ msgstr ""
 "그리고 우선순위를 쓰는 필터들은 점수를 사용하게 됩니다.  이렇게\n"
 "가져온 필터들이 의도한 대로 제대로 동작하는 지 확인하십시오."
 
-#: 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"
@@ -14022,7 +14074,7 @@ msgstr ""
 "이 기능은 Evolution에서 지원하지 않습니다.\n"
 "해당 거르게를 무시합니다."
 
-#: 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"
@@ -14036,23 +14088,23 @@ msgstr ""
 "않습니다. 이 거르게는 해당 문자열이 메세지 본문에 들어\n"
 "있는 지 여부에 대한 검사로 대체합니다."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "넷스케이프 데이터를 Evolution에 가져오는 중입니다"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 msgid "Importing Netscape data"
 msgstr "넷스케이프 데이터 가져오기"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "설정"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "메일 거르게"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14084,61 +14136,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "현재 저장 포멧:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "본문 내용의 색인을 만듭니다"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "새 저장 형식:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"주의: 메일함 형식을 변환할 때, 실패하는 경우 (예를 들어 디스크 공간 부족) 자"
-"동으로 복구하지 못할 수도 있습니다.  이 기능은 조심해서 사용하십시오."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "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 "필요한 정보중에 입력하지 않은 정보가 있습니다."
 
 #. 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 계정 편집기"
 
-#: 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 "호스트(_H):"
 
-#: 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 "사용자이름(_N):"
 
-#: 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 "경로(_P):"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "같은 이름으로 두 개의 계정을 만들 수 없습니다."
 
@@ -14171,11 +14190,11 @@ msgstr "%s에 회신"
 msgid "Add Filter Rule"
 msgstr "거르게 규칙을 더하기"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "다음 거르게 규칙:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14190,39 +14209,39 @@ msgstr ""
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "보내지 않은 메세지가 있습니다, 그래도 끝내시겠습니까?"
 
-#: mail/mail-component.c:578
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "새 메일 메세지"
 
-#: mail/mail-component.c:579
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "메일 만들기(_M)"
 
-#: mail/mail-component.c:580
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "메일 메세지를 새로 작성합니다"
 
-#: mail/mail-component.c:585
+#: mail/mail-component.c:594
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: mail/mail-component.c:586
+#: mail/mail-component.c:595
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: mail/mail-component.c:587
+#: mail/mail-component.c:596
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: mail/mail-component.c:754
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr "뷰가 표시할 메일 소스의 URI"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "신원"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14231,11 +14250,12 @@ msgstr ""
 "아래에 이름과 메일 주소를 입력하십시오. 그 아래에 있는 \"선택\" 필드는 메일"
 "을 보낼 때 정보를 더하지 않고 싶으면 채우지 않아도 됩니다."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "메일 받기"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14243,15 +14263,15 @@ msgstr ""
 "아래에 들어오는 메일 서버에 대한 정보를 입력하십시오. 확실히 모른다면, 시스"
 "템 관리자나 인터넷 서비스 제공자에게 물어보십시오."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "메일 보내기"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14259,11 +14279,11 @@ msgstr ""
 "메일을 보낼 방법에 대해 정보를 입력하십시오. 잘 모르겠으면, 시스템 관리자나 "
 "인터넷 서비스 제공자에게 물어 보십시오."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "계정 관리"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14276,123 +14296,257 @@ msgstr ""
 "니다. 이 계정의 이름을 아래의 빈 칸에 입력하십시오. 이 이름은 표시할 목적으로"
 "만 사용됩니다."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "서비스 확인중"
 
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
 msgid "Connecting to server..."
 msgstr "서버에 연결중..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr "지원하는 형식인지 확인(_C) "
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "미리 보기"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(이 Evolution 빌드는 SSL을 지원하지 않습니다)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "(이 evolution 빌드는 SSL을 지원하지 않습니다)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(이 evolution 빌드는 SSL을 지원하지 않습니다)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>상태:<b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>상태:<b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>표시할 메일 헤더(_D)</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 "암호화된 메일을 보낼 때 자신에 대해서도 암호화(_L)"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "계정 편집기"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "계정 정보"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "새 메일 검사"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "스크립트 더하기(_R)"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "새 서명 더하기..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "암호화된 메일을 보낼 때 언제나 자신에 대해서 암호화(_W)"
+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>표시할 메일 헤더(_D)</b>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "항상 숨은 참조(_B):"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "항상 참조(_C):"
+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 "새 메일 알림"
+
+#: 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 "임시 보관함의 메세지를 보냅니다"
+
+#: 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 "암호화된 메일을 보낼 때 자신에 대해서도 암호화(_L)"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "계정 편집기"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "새 서명 더하기..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "스크립트 더하기(_R)"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "암호화된 메일을 보낼 때 언제나 자신에 대해서 암호화(_W)"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "항상 참조(_C):"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "항상 숨은 참조(_B):"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "이 계정을 사용하면 보내는 메세지에 항상 사인합니다(_A)"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "키 모음에 들어 있는 키는 암호화할 때 언제나 신뢰합니다(_T)"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "원래 메세지 첨부"
 
-#: 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 "첨부"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "인증"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "자동으로 이모티콘 그림 넣기(_A)"
 
-#: mail/mail-config.glade.h:23
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "새 메일을 자동으로 확인(_A), 매"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "발트어 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "발트어 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "새 메일이 도착하면 삑 소리냄(_B)"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "글자셋(_H):"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "색(_O)"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "지원하는 형식인지 확인(_C) "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "새 메일 확인(_I)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "입력할 때 맞춤법 검사(_T)"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "새 메일 검사"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "받는 메일이 정크메일인 지 검사합니다"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "맞춤법이 틀린 글자의 색상(_M):"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "메세지 만들기"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "색(_O)"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "설정"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "폴더를 지울 때 확인(_C)"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14408,273 +14562,261 @@ msgstr ""
 "\n"
 "설정을 저장하려면 \"적용\"을 누르십시오."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "기본값(_F)"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "기본 동작"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "기본 글자 인코딩(_E):"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "메일 지우기"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "나가는 메세지에 항상 디지탈 서명함(_S)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "기본값(_D)"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "원래 메세지를 인용하지 않음"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "회의 요청에 대해 서명하지 않습니다 (Outlook 호환)(_M)"
 
-#: 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 "완료"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "임시 보관함 폴더(_F):"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "메일 계정"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "전자메일 주소(_A):"
 
-#: 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 "끝날 때 휴지통 폴더 비우기(_T)"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "암호화 인증서(_P):"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution 계정 도우미"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "명령 실행..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "고정폭(_X):"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "거르게 옵션"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "글꼴 등록 정보"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "HTML 형식 메세지(_H)"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "HTML 메일(_H)"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "머리말(_E):"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 강조(_Q):"
 
-#: 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 "포함"
 
-#: 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 "꼬리표 및 색"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "그림 읽어들이기"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "메일함 위치"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "메세지 작성기"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "메세지 표시"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "메세지 글꼴"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "새 메일 알림"
-
-#: 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"
 msgstr "알림: 처음 연결하면 열쇠글을 물어보는 창이 뜰 것입니다"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "선택 사항 정보"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 키 ID(_K):"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "색을 고르십시오"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "새 메일이 도착하면 소리 연주(_P)"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "숨은 참조로만 메세지를 보내려 할 때 확인(_O)"
 
-#: 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 "인쇄 글꼴"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Qmail 메일 디렉토리 "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr "원래 메세지를 인용"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "인용"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "이 열쇠글 기억(_M)"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "열쇠글 기억"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "회신 주소(_P):"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "메일을 받음"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "받기 옵션(_O)"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "이 열쇠글 기억(_P)"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "필요한 정보"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "기본값으로 되돌리기"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "열쇠글 기억"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "보안(_E)"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "보통 글꼴(_S):"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "보안 MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "보안(_S)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "HTML 고정폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "인쇄에 사용할 HTML 고정폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "HTML 가변폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "인쇄에 사용할 HTML 가변폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "선택(_S)..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "메일을 보냄"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "보낸 편지함 메세지 폴더(_M):"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "임시 보관함의 메세지를 보냅니다"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "서버가 인증을 요구합니다(_V)"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "서버 설정"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "서버 종류(_T): "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "서명 인증서(_G):"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "서명:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "서명(_S)"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "파일 이름 지정(_F):"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "맞춤법 검사(_C)"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "표준 유닉스 mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "터미널 글꼴(_T):"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "형태:"
+
+#: 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"
@@ -14683,7 +14825,7 @@ msgstr ""
 "다음 스크립트의 출력물이 서명으로 사용됩니다. \"이름\"은 표시 목적으로만 이용"
 "됩니다."
 
-#: 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 "
@@ -14692,7 +14834,7 @@ msgstr ""
 "이 페이지에서 맞춤법 검사 방법과 검사할 언어를 설정할 수 있습니다. 사전을 설"
 "치한 언어만 여기 언어 목록에 보입니다."
 
-#: 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\""
@@ -14700,15 +14842,15 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "데몬 사용(_D)"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "가변폭(_A):"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14718,170 +14860,102 @@ msgstr ""
 "\n"
 "시작하려면 \"다음\"을 누르십시오. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "서명 더하기(_A)"
 
-#: 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 "항상 네트워크에서 그림 읽어들이기(_A)"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "이 계정을 사용하면 보내는 메세지에 항상 사인합니다(_A)"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "인증 형식(_A):"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "인증 형식(_A): "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "새 메일을 자동으로 확인(_A), 매"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "자동으로 이모티콘 그림 넣기(_A)"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "새 메일이 도착하면 삑 소리냄(_B)"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "폴더를 지울 때 확인(_C)"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "기본 서명(_D):"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "기본값(_D)"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "나가는 메세지에 항상 디지탈 서명함(_S)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "새 메일이 도착해도 알리지 않음(_D)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "보내는 메세지 암호화 (기본값으로)(_E)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "전체이름(_F):"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "HTML 메일(_H)"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "신원(_I)"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "정크(_J)"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "보낸 사람이 주소록에 있으면 그림 읽어들이기(_L)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "로컬 검사만 사용(_L)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "내 기본 계정으로 하기(_M)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: 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 "그림을 네트워크에서 읽어들이지 않기(_N)"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "새 메일이 도착하면 소리 연주(_P)"
-
-#: 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 "HTML 메세지를 원하지 않는 사람한테 보내려 할 때 확인(_P)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "빈 제목으로 메세지를 보내려 할 때 확인(_P)"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "메일 받기(_R)"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "회신 모양(_R):"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "기본값 복구(_R)"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "스크립트(_S):"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "선택(_S)..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "메일 보내기(_S)"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "그림 움직임 보이기(_S)"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "서명(_S)"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "보통 글꼴(_S):"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "터미널 글꼴(_T):"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "보안 연결(SSL) 사용(_U):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 쓰기(_U)"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "분"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "색상"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "설명"
 
@@ -14890,7 +14964,7 @@ msgstr "설명"
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중입니다"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14899,7 +14973,7 @@ msgstr ""
 "'%s' 중 오류:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14908,7 +14982,7 @@ msgstr ""
 "작업을 수행하는 중에 오류가 발생했습니다:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "작업 중"
 
@@ -15029,16 +15103,18 @@ msgid "Retrieving message %s"
 msgstr "메세지 %s을(를) 가져오기"
 
 #: mail/mail-ops.c:1838
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "메세지 %d개 가져오는중"
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "메세지 %d개 가져오는중"
 
-#: mail/mail-ops.c:1922
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "메시지 %d개 저장중"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "메시지 %d개 저장중"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15047,7 +15123,7 @@ msgstr ""
 "출력파일을 만들 수가 없습니다: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15056,11 +15132,11 @@ msgstr ""
 "%s(으)로 메시지 저장 중 오류 발생:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15069,17 +15145,17 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "데이터를 쓸 수가 없습니다: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
@@ -15096,84 +15172,80 @@ msgstr "메세지에서 찾음"
 msgid "Find:"
 msgstr "찾기:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "찾기"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "디지탈 서명"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "암호화"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "보안 정보"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "취소 중..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "서버: %s, 형식: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "경로: %s, 형식: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "형식: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "메일 주고받기"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "모두 취소(_A)"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "업데이트 중..."
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "열쇠글 입력"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "이 열쇠글 기억(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "이 세션에서 이 열쇠글을 기억합니다(_R)"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "서명 파일을 저장할 수 없습니다: %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"
@@ -15183,23 +15255,23 @@ msgstr ""
 "\n"
 "바뀐 내용을 저장하시겠습니까?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "바뀐 내용 버리기(_D)"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "서명 저장"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "서명 편집"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "이 서명의 이름을 입력하십시오."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "이름:"
 
@@ -15227,17 +15299,17 @@ msgstr "전달된 메시지"
 msgid "Invalid folder: `%s'"
 msgstr "잘못된 폴더: `%s'"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "가상 폴더 설정: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "가상폴더의 uri 새로 고침: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15250,85 +15322,85 @@ msgstr ""
 "    '%s'\n"
 "가 새로 고쳐졌습니다."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "가상 폴더"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "가상폴더 편집"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "없는 가상 폴더 '%s'을(를) 편집하려 합니다."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "새 가상폴더"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "봤음"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "응답함"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메세지"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "낮음"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "높음"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "가장 높음"
 
 # ???
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%b %-d일 %p %l:%M"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr "%Y년 %b %-d일"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
@@ -15413,7 +15485,8 @@ msgstr ""
 "\"플래그\" 메뉴에서 추가 작업 동작을 선택하십시오."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "마감(_D):"
 
 #: mail/message-tags.glade.h:7
@@ -15617,7 +15690,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "어디로 가져올 지를 고르십시오"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
 msgstr "다음에서 가져오고 싶은 정보를 선택하십시오:"
 
@@ -15645,26 +15718,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "가져오기 선택"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
 msgstr "파일 %s은(는) 없습니다."
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "가져오는 중입니다"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
 msgstr "%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 "%s 읽어들이는 중 오류가 발생했습니다"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15673,31 +15746,31 @@ msgstr ""
 "%s을(를) 가져오는 중\n"
 "아이템 1을 가져옴."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "자동"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "파일 이름(_F):"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "파일을 고르십시오"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "파일 종류(_T):"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "과거에 쓰던 프로그램에서 데이터 및 설정 사항 가져오기(_O)"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "파일 한 개 가져오기(_S)"
 
-#: 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"
@@ -15705,25 +15778,25 @@ msgstr ""
 "잠시 기다려 주십시오...\n"
 "현재 설정을 검사중입니다"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "똑똑한 가져오기를 시작하는 중입니다"
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
 msgstr "%s에서:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
 msgstr "%s 파일에 사용할 수 있는 가져오기 기능이 없습니다"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
 msgstr "가져오기 기능을 실행할 수 없습니다"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "가져오기(_I)"
 
@@ -15731,7 +15804,7 @@ msgstr "가져오기(_I)"
 msgid "Closing connections..."
 msgstr "연결 닫는중..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution 설정"
 
@@ -15765,11 +15838,11 @@ msgstr "공유 폴더를 열 수 없습니다: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "명시된 공유 폴더를 찾을 수 없습니다."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "가져오기 시작하는 중"
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15886,7 +15959,6 @@ msgstr "확인란"
 # FIXME: charset  picker에서 Western European, New 식으로 쓰인다
 #: 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 "새로 만들기"
 
@@ -15940,16 +16012,17 @@ msgid "Create a new test item"
 msgstr "새 테스트 항목을 만듭니다"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "사용중인 연결"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
+msgid "Active Connections"
+msgstr "사용중인 연결"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "현재 사용중인 연결은 다음과 같습니다:"
+msgid "Click OK to close these connections and go offline"
+msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16066,28 +16139,28 @@ msgstr ""
 "이 도우미의 안내에 따라 외부의 파일들을 Evolution으로 가져오는 단계 단계를 따"
 "르십시오."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "가져오기"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "가져오기"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "가져오지 말기"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "다시 물어보지 않습니다"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "다음 파일들을 Evolution으로 가져올 수 있습니다:"
 
 #. 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"
@@ -16121,7 +16194,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에 기여해\n"
 "주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16129,48 +16202,48 @@ msgstr ""
 "고맙습니다\n"
 "Ximian Evolution 팀\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "다시 물어보지 않습니다"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution 쉘에 접근할 수 없습니다."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution 쉘을 초기화 할 수 없습니다: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution 시작할 때 특정 컴포넌트를 활성화합니다"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "오프라인 모드에서 시작"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "강제로 모든 Evolution 컴포넌트를 끝냅니다"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 Evolution 1.4에서 다시 옮겨 옵니다"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16179,30 +16252,30 @@ msgstr ""
 "%s: --online과 --offline은 같이 쓸 수 없습니다\n"
 "  자세한 정보를 %s --help를 실행하십시오.\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 "가져올 인증서를 선택하십시오..."
 
-#: 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 "인증서 이름"
 
-#: 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 "목적"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "일련 번호"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "만료"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "전자메일 주소"
 
@@ -16211,11 +16284,22 @@ msgstr "전자메일 주소"
 msgid "Certificate Viewer: %s"
 msgstr "인증서 보기: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "`%s'의 열쇠글을 입력하십시오"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "%s의 열쇠글을 입력하십시오"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "열쇠글을 입력하십시오"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16406,7 +16490,8 @@ msgstr "다음 사람들은 확인할 수 있는 인증서가 있습니다:"
 msgid "Your Certificates"
 msgstr "내 인증서"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr "인증서가 이미 있습니다"
 
@@ -16677,7 +16762,7 @@ msgstr "연락처를 다른 폴더로 옮깁니다..."
 msgid "Move to Folder..."
 msgstr "폴더로 이동..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "클립보드에서 붙여 넣습니다"
 
@@ -16687,7 +16772,7 @@ msgstr "인쇄할 연락처를 미리 봅니다"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "인쇄 미리 보기(_V)"
 
@@ -16735,13 +16820,13 @@ msgstr "읽어들이기를 중지합니다"
 msgid "View the current contact"
 msgstr "현재 연락처를 봅니다"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h: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 "실행(_A)"
 
@@ -16762,14 +16847,10 @@ msgid "_Save as VCard"
 msgstr "VCard로 저장(_S)"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "연락처 찾기(_S)"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "전부 선택(_S)"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "연락처로 메세지 보내기(_S)..."
 
@@ -16777,58 +16858,54 @@ msgstr "연락처로 메세지 보내기(_S)..."
 msgid "Day"
 msgstr "하루"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "모든 해당 항목을 지웁니다"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "약속을 지웁니다"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "이 항목을 지웁니다"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "이 항목을 지웁니다"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "가기"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "뒤로 가기"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "앞으로 가기"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "날짜로 이동(_D)"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "지정한 날로 가기"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "오늘로 가기"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "목록"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "한 달"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "다음"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "인쇄할 달력을 미리 봅니다"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "이전"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "이 달력을 인쇄합니다"
@@ -16838,7 +16915,7 @@ msgstr "이 달력을 인쇄합니다"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "이 달력의 약속 있음/없음 정보를 게시합니다"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "비우기(_E)"
 
@@ -16847,34 +16924,54 @@ msgid "Purge old appointments and meetings"
 msgstr "지나간 약속과 회의를 지웁니다"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "모든 텍스트 선택"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "지정한 날로 가기"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "폴더 선택"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "목록으로 봅니다"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "하루씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "한달씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "한주씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "한 주의 근무일을 봅니다"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "오늘"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "현재 약속을 봅니다"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "한주씩"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
@@ -17414,10 +17511,6 @@ msgstr "이동"
 msgid "Move selected message(s) to another folder"
 msgstr "선택한 메세지를 다른 폴더로 옮깁니다"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "다음"
-
 #: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "다음 중요한 메세지(_I)"
@@ -17469,10 +17562,6 @@ msgstr "이전의 중요한 메세지"
 msgid "Preview the message to be printed"
 msgstr "인쇄할 메시지를 미리봅니다"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "이전"
-
 #: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "이 메세지 인쇄"
@@ -17883,39 +17972,39 @@ msgstr "선택한 작업을 복사합니다"
 msgid "Cut selected task"
 msgstr "선택한 작업을 잘라냅니다"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "끝마친 작업을 지웁니다"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "선택한 작업을 지웁니다"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "완료 표시(_K)"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "선택한 작업을 마친 것으로 표시합니다"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "클립보드에서 작업을 붙여 넣습니다"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "인쇄할 작업 목록을 미리 봅니다"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "작업 목록 인쇄"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "선택한 작업을 봅니다"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "작업 열기(_O)"
 
@@ -18044,10 +18133,15 @@ msgid "_Day View"
 msgstr "일별 보기(_D)"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "목록 보기"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "월별 보기(_M)"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "근무일 주별 보기(_W)"
 
@@ -18076,10 +18170,16 @@ msgid "_Messages"
 msgstr "메세지(_M)"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "분류(_M)"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "마감 날짜(_D):"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "상태 설정"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "작업(_T)"
 
@@ -18141,10 +18241,6 @@ msgstr "%Y년 %b"
 msgid "Now"
 msgstr "현재"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "오늘"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18154,82 +18250,87 @@ msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "퍼센트 값은 0과 100을 포함하여 그 사이어야 합니다."
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "발트어"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "중앙 유럽어"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "중국어"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "키릴어"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "그리스어"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "일본어"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "한국어"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "터키어"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "유니코드"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "서부 유럽어"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "서부 유럽어"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "번체"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
 msgid "Simplified"
 msgstr "간체"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "우크라이나어"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "비주얼"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "알 수 없는 글자셋: %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 "문자 인코딩"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "사용할 글자셋을 입력하십시오"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "그 외..."
 
@@ -18292,6 +18393,11 @@ msgstr "표시 여백"
 msgid "Spacing around expander arrow"
 msgstr "확장 화살표 주위의 여백"
 
+#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "찾기(_S)"
+
 #: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "찾기 편집기"
@@ -18355,6 +18461,272 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "주소록 원본"
+
+#~ msgid "Selected:"
+#~ msgstr "선택:"
+
+#~ msgid "1 contact"
+#~ msgstr "연락처 1개"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "그리고 기타 연락처 %d개."
+
+#~ msgid "1 day"
+#~ msgstr "1일"
+
+#~ msgid "1 week"
+#~ msgstr "1주"
+
+#~ msgid "1 hour"
+#~ msgstr "1시간"
+
+#~ msgid "1 minute"
+#~ msgstr "1분마다"
+
+#~ msgid "1 second"
+#~ msgstr "1초"
+
+#~ msgid "Description"
+#~ msgstr "설명"
+
+#~ msgid "component"
+#~ msgstr "컴포넌트"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Alarms"
+#~ msgstr "알림"
+
+#~ msgid "Geographical Position"
+#~ msgstr "지리학적 위치"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "%d일마다"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "%d주마다"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "Every %d weeks on "
+#~ msgstr "%d주마다 "
+
+#~ msgid "every %d months"
+#~ msgstr "%d달마다"
+
+#~ msgid "Every %d years"
+#~ msgstr "%d년마다"
+
+#~ msgid "Go To Date"
+#~ msgstr "날짜로 가기"
+
+#~ msgid "_Go To Today"
+#~ msgstr "오늘로 가기(_G)"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP 서버 이름:"
+
+#~ msgid "Search base:"
+#~ msgstr "찾기 기준:"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d초 전"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d분 전"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d시간 전"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d일 전"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d주 전"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d달 전"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d년 전"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "Then"
+#~ msgstr "동작 선택"
+
+#~ msgid "If"
+#~ msgstr "조건 선택"
+
+#~ msgid "Edit Filters"
+#~ msgstr "거르게 편집"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "가상폴더 편집"
+
+#~ msgid "Outgoing"
+#~ msgstr "나가는 것"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "쉘 명령으로 메세지 파이프"
+
+#~ msgid "Shell Command"
+#~ msgstr "쉘 명령"
+
+#~ msgid "Rules"
+#~ msgstr "규칙"
+
+#~ msgid "[script]"
+#~ msgstr "[스크립트]"
+
+#~ msgid "Add script signature"
+#~ msgstr "스크립트 서명 더하기"
+
+#~ msgid "Current store format:"
+#~ msgstr "현재 저장 포멧:"
+
+#~ msgid "Index body contents"
+#~ msgstr "본문 내용의 색인을 만듭니다"
+
+#~ msgid "New store format:"
+#~ msgstr "새 저장 형식:"
+
+#~ 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 ""
+#~ "주의: 메일함 형식을 변환할 때, 실패하는 경우 (예를 들어 디스크 공간 부족) "
+#~ "자동으로 복구하지 못할 수도 있습니다.  이 기능은 조심해서 사용하십시오."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(이 Evolution 빌드는 SSL을 지원하지 않습니다)"
+
+#~ msgid "Account Information"
+#~ msgstr "계정 정보"
+
+#~ msgid "Authentication"
+#~ msgstr "인증"
+
+#~ msgid "Composing Messages"
+#~ msgstr "메세지 만들기"
+
+#~ msgid "Configuration"
+#~ msgstr "설정"
+
+#~ msgid "Default Behavior"
+#~ msgstr "기본 동작"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "메일 지우기"
+
+#~ msgid "Filter Options"
+#~ msgstr "거르게 옵션"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "꼬리표 및 색"
+
+#~ msgid "Loading Images"
+#~ msgstr "그림 읽어들이기"
+
+#~ msgid "Message Display"
+#~ msgstr "메세지 표시"
+
+#~ msgid "Message Fonts"
+#~ msgstr "메세지 글꼴"
+
+#~ msgid "Optional Information"
+#~ msgstr "선택 사항 정보"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "인쇄 글꼴"
+
+#~ msgid "Re_member this password"
+#~ msgstr "이 열쇠글 기억(_M)"
+
+#~ msgid "Remember this _password"
+#~ msgstr "이 열쇠글 기억(_P)"
+
+#~ msgid "Required Information"
+#~ msgstr "필요한 정보"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "기본값으로 되돌리기"
+
+#~ msgid "S_ecurity"
+#~ msgstr "보안(_E)"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "보안 MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "서버 설정"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "인증 형식(_A):"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "인증 형식(_A): "
+
+#~ msgid "_Default signature:"
+#~ msgstr "기본 서명(_D):"
+
+#~ msgid "_Full name:"
+#~ msgstr "전체이름(_F):"
+
+#~ msgid "_Identity"
+#~ msgstr "신원(_I)"
+
+#~ msgid "_Junk"
+#~ msgstr "정크(_J)"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "메일 받기(_R)"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "기본값 복구(_R)"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "메일 보내기(_S)"
+
+#~ msgid "Search"
+#~ msgstr "찾기"
+
+#~ msgid "Digital Signature"
+#~ msgstr "디지탈 서명"
+
+#~ msgid "Encryption"
+#~ msgstr "암호화"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "현재 사용중인 연결은 다음과 같습니다:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "연락처 찾기(_S)"
+
+#~ msgid "Go to _Date"
+#~ msgstr "날짜로 이동(_D)"
+
+#~ msgid "Go to today"
+#~ msgstr "오늘로 가기"
+
+#~ msgid "With _Category"
+#~ msgstr "분류(_M)"
+
 #~ msgid "Send an Email"
 #~ msgstr "전자메일 보내기"
 
@@ -18427,9 +18799,6 @@ msgstr "%s (%d%% 완료)"
 #~ "IMAP 계정에 대해 받은 메일에 쓰레기 테스트를 실행합니다 (check_incoming이 "
 #~ "참일 경우에만 효과가 있습니다)"
 
-#~ msgid "    "
-#~ msgstr "    "
-
 #~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
 #~ msgstr "IMAP 계정은 받은 메일을 검사하지 않음(_N)"
 
diff --git a/po/lt.po b/po/lt.po
index 01afa3c639..63bdf89d09 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-01-13 11:05+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@tuxfamily.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -18,6 +18,47 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\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 Adresų Knyga"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Išvardinti visus vietinius adresų knygos aplankus"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Išsaugoti kaip"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kortelės"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "kortelės"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktai: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Aliarmas"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Įprastas Sinchronizavimo Adresas:"
@@ -96,76 +137,92 @@ msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresų knygutė „%s“ bus pašalinta. Ar Jūs tikrai norite taip pasielgti?"
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Nauja Adresų Knyga"
 
-#: 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 "Ištrinti"
 
-#: 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 "Savybės..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Sukurti naują kontaktą"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Naujas kontaktų sąrašas"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "_Kontaktų sąrašas"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Sukurti naują kontaktų sąrašą"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Nauja Adresų Knyga"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Adresų _Knyga:"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Sukurti naują užduotį"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Nepavyko susisiekti su LDAP serveriu"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nepavyko autentifikavimasis su LDAP serverių"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Negalima daryti užklausos tarp pagrindinio 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 "Serveris nepateikė tinkamų paieškos platformų"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Šis serveris nepalaiko LDAPv3 schemų informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Klaida gaunant schemų informaciją"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Serveris nepateikė tvarkingos schemų informacijos"
 
@@ -194,17 +251,17 @@ msgstr "Perkeliamas „%s“:"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Šiame Kompiuteryje"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Asmeninis"
 
@@ -258,7 +315,7 @@ msgstr "Šios adresų knygos posistemė atsisakė apdoroti pateiktą užklausą.
 msgid "This query did not complete successfully."
 msgstr "Ši užklausa nesibaigė sėkmingai."
 
-#: 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."
@@ -266,7 +323,7 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygelės. Patikrinkite, ar kelias egzistuoja "
 "ir ar Jūs turite teises jį pasiekti."
 
-#: 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."
@@ -274,7 +331,7 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
 "neteisingą adresą arba nurodytas LDAP serveris yra nepasiekiamas."
 
-#: 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 "
@@ -284,7 +341,7 @@ msgstr ""
 "naudoti LDAP su Evolution, Jums teks sukompiliuoti programą iš pradinių "
 "tekstų prieš tai įdiegus OpenLDAP iš žemiau esančio adreso."
 
-#: 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."
@@ -292,28 +349,28 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
 "neteisingą adresą arba nurodytas serveris yra nepasiekiamas."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adresų knygelės"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Susisiekiama su LDAP serveriu anonimiškai"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Autorizacija nepavyko.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %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 "Išvedamų kontaktų šaltinio ID"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "URI, kurį rodys kalendorius"
@@ -340,16 +397,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "Aplanko adresas paskutinį kartą panaudotas vardų pasirinkimo dialoge"
 
 #: 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 "  _Rodyti Palaikomas Bazes "
 
-#: 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
@@ -364,62 +415,53 @@ msgstr "  _Rodyti Palaikomas Bazes "
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Adresų Knygos Kūrimo Pagalbininkas"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adresų knygelės savybės"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Adresų Knygos Šaltiniai..."
-
-#: 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 "Visada"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonimiškai"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -431,51 +473,51 @@ msgstr ""
 "\n"
 "Paspauskite „Pabaigti“ mygtuką, kad išsaugoti dabar įvestus nustatymus."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Skirtinis _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "El. pašto adresas:"
 
-#: 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 naudos šį skirtinį vardą (DN) autentifikacijos su serveriu metu"
 
-#: 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 naudos šį el. pašto adresą autentikuotis į pašto 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 "Baigta"
 
-#: 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 "Esmė"
 
-#: 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 "Grupė:"
 
-#: 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 "Niekada"
 
-#: 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"
@@ -492,23 +534,19 @@ msgstr ""
 "serveris naudoja\n"
 "šiuos protokolus."
 
-#: 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 "Pai_eškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Ieškoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Pasirinkta:"
-
-#: 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"
@@ -518,7 +556,7 @@ msgstr ""
 "serverio tik tuo atveju,\n"
 "jei LDAP serveris palaikys SSL arba 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"
@@ -536,7 +574,7 @@ msgstr ""
 "nes Jūsų jungtis\n"
 "yra apsaugota nuo išorinių įsilaužėlių."
 
-#: 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"
@@ -549,7 +587,7 @@ msgstr ""
 "kad Jūsų jungtis nebus apsaugota ir Jums gresia duomenų ar jungties "
 "perėmimas. "
 
-#: 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 "
@@ -560,7 +598,7 @@ msgstr ""
 "paieškų\n"
 "bei kontaktų kūrimo/keitimo nustatymus. "
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -569,32 +607,32 @@ msgid ""
 msgstr ""
 "Pirmiausiai kuriant adresų knygą reikia nustatyti išvedamą vardą ir grupę."
 
-#: 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 "1-as žingsnis: Aplanko Savybės"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "2-as žingsnis: Serverio Informacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "3-as žingsnis: Jungiamasi prie Serverio"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "4-as žingsnis: Vykdoma paieška kataloge"
 
-#: 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 "Palaikomos Paieškos Bazės"
 
-#: 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"
@@ -608,7 +646,7 @@ msgstr ""
 "jei Jums\n"
 "reikia pakeisti čia esančias reikšmes."
 
-#: 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"
@@ -620,7 +658,7 @@ msgstr ""
 "paieškos. Neužpildžius šios reikšmės paieška bus vykdoma nuo katalogo "
 "pradžios."
 
-#: 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"
@@ -635,7 +673,7 @@ msgstr ""
 "sritis „one“\n"
 "pateiks tik pirmame paieškos bazės lygyje esančius įrašus.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -651,7 +689,7 @@ msgstr ""
 "tekti pateikti papildomus parametrus. Susisiekite su savo\n"
 "sistemos administratoriumi, jei Jūs neturėsite reikiamos informacijos."
 
-#: 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"
 "\"."
@@ -659,7 +697,7 @@ msgstr ""
 "Čia nurodomas pilnas Jūsų LDAP serverio vardas. Pavyzdžiui „ldap.example."
 "com“."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -669,7 +707,7 @@ msgstr ""
 "Čia yra nurodomas didžiasias atsiunčiamų įrašų kiekis. Nustačius per didelę\n"
 "reikšmę gali sulėtėti Jūsų adresų knygos darbas."
 
-#: 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 "
@@ -679,7 +717,7 @@ msgstr ""
 "pasinaudoti „El. pašto adreso“ metodu būtinas anoniminis prisijungimas prie "
 "Jūsų LDAP serverio."
 
-#: 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"
@@ -688,7 +726,7 @@ msgstr ""
 "Šis vardas bus priskirtas serveriui Evolution aplankų sąraše.\n"
 "Jis skirtas tiktai vaizdavimui."
 
-#: 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 "
@@ -697,7 +735,7 @@ msgstr ""
 "Šis vardas bus naudojamasi Evolution programos aplankų sąraše. Jis skirtas "
 "tiktai vaizdavimui."
 
-#: 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"
@@ -708,28 +746,28 @@ msgstr ""
 "Standartinių prievadų sąrašas yra pateiktas. Pasiteiraukite savo sistemos \n"
 "administratoriaus, jei nežinote, kurį prievadą reikia pasirinkti."
 
-#: 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 "Šis nustatymas valdo didžiausią galimą paieškos trukmę."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Naudoti _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Naudojamas skirtinis vardas (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Naudojamas el. pašto adresas"
 
-#: 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 "Kai tik imanoma"
 
-#: 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"
@@ -741,60 +779,48 @@ msgstr ""
 "parametrus. Pasiteiraukite savo sistemos administratoriaus, jei Jūs nesate "
 "tikri dėl to, ką čia reikia įvesti."
 
-#: 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 "Ro_domas vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: 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 "K_eisti"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Prisijungimo metodas"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Pauzės riba (minutėmis):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kortelės"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr "jungties-kortelė"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr "bendrinė-kortelė"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr "paieškos-kortelė"
 
@@ -826,7 +852,7 @@ msgid "Send HTML Mail?"
 msgstr "Siųsti HTML paštą?"
 
 #: 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 "Pridėti prie kontaktų"
 
@@ -842,7 +868,7 @@ msgstr "Vardas"
 
 #: 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 "Šaltinis"
 
@@ -909,7 +935,8 @@ msgstr "Bendradarbiavimas"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
@@ -918,7 +945,7 @@ msgid "D_epartment:"
 msgstr "_Padalinys:"
 
 #: 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 "Detalės"
@@ -1002,16 +1029,27 @@ msgstr "_Kategorijos..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Ištrinti"
 
+#: 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 "K_eisti"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Namai:"
@@ -1053,22 +1091,22 @@ msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Adresas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Taisomas"
 
@@ -2051,9 +2089,9 @@ msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2067,20 +2105,21 @@ msgid "MSN Messenger"
 msgstr "_Pašto laiškas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Paslauga"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Vieta:"
@@ -2091,112 +2130,96 @@ msgid "Username"
 msgstr "Vartotojo _vardas:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Namų"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Darbinis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Pradinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Tikslinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Tai Naujas Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Keičiami Laukai"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Pakeista"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Abonemento vardas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Kategorijų redaktorius nepasiekiamas."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontaktas priklauso šioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Išsaugoti kontaktą tarp VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ar Jūs tikrai norite\n"
-"ištrinti šiuos kontaktus?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ar tu tikrai nori\n"
-"ištrinti šį kontaktą?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Darbo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nepavyko rasti lauko objekto: „%s“"
@@ -2210,6 +2233,7 @@ msgid "_Edit Full"
 msgstr "_Taisyti Pilną"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Pilnas vardas:"
 
@@ -2217,6 +2241,22 @@ msgstr "_Pilnas vardas:"
 msgid "E-_mail:"
 msgstr "El. paštas"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ar Jūs tikrai norite\n"
+"ištrinti šiuos kontaktus?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ar tu tikrai nori\n"
+"ištrinti šį kontaktą?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresas _2:"
@@ -2320,24 +2360,28 @@ msgstr "_Titulas:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Sąskaitos vardas"
+msgid "Add IM Account"
+msgstr "Pašto Sąskaitos"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Pašto Sąskaitos"
+msgid "_Account name:"
+msgstr "Sąskaitos vardas"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Paslauga"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Vieta:"
 
+#: 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 "Nariai"
@@ -2359,25 +2403,26 @@ msgstr ""
 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 "Knyga"
 
-#: 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 "Tai Naujas Sąrašas"
 
 #. 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 "Kontaktų sąrašo redaktorius"
 
-#: 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 "Išsaugoti Sąrašą tarp VCard"
 
@@ -2429,23 +2474,22 @@ msgid "No contacts"
 msgstr "Nėra kontaktų"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 kontaktas"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d kontaktai"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontaktai"
+msgstr[1] "%d kontaktai"
+msgstr[2] "%d kontaktai"
 
-#: 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 "Užklausa"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Klaida gaunant knygos peržiūrą"
 
@@ -2457,133 +2501,132 @@ msgstr "Modelis"
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortelę"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Vardas prasideda"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "El. paštas prasideda"
 
-#: 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 "Kategorija yra"
 
 #. 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 "Bet kuris laukas turi savyje"
 
-#: 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 "Išsami..."
 
-#: 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 "Tipas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresų _Knyga:"
 
-#: 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 "Išsaugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Naujas Kontaktas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Naujas Kontaktų Sąrašas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Eiti į Aplanką..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Ieškoti Kontaktų..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adresų Knygos Šaltiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilot Nustatymai..."
 
-#: 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 "Persiųsti kontaktą"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Siųsti laišką kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Spausdinti voką"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: 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 "Iškirpti"
 
-#. 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 "Kopijuoti"
 
-#: 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 "Įdėti"
 
-#: 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 "Esamas vaizdas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2595,7 +2638,7 @@ msgstr ""
 "darbas. Jums teks paleisti Evolution iš naujo tam, kad pasinaudoti ja vėl"
 
 #. 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 "Bet kuri kategorija"
@@ -2629,8 +2672,6 @@ msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
 #: 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 "Kategorijos"
 
@@ -2639,7 +2680,7 @@ msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "El. paštas"
 
@@ -2690,6 +2731,7 @@ msgid "Manager"
 msgstr "Vadybininkas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
@@ -2698,7 +2740,7 @@ msgid "Nickname"
 msgstr "Pravardė"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Pastaba"
 
@@ -2707,7 +2749,7 @@ msgid "Office"
 msgstr "Ofisas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -2763,17 +2805,17 @@ msgid "Web Site"
 msgstr "Tinklapis"
 
 #: 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 "Plotis"
 
 #: 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 "Aukštis"
 
 #: 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 "Turi Fokusavimą"
 
@@ -2825,89 +2867,92 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapteris"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Parinkta"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Turi Žymeklį"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Parodyti Sąrašą"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "El. paštas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Darbinis"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Aprašymas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupė"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Vaizdo Konferencijų Adresas:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Asmeninis"
+msgid "work"
+msgstr "Darbinis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr "Žurnalas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Asmeninis"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Pareigos"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Namų puslapis"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Sėkmė"
 
-#: 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
@@ -2915,93 +2960,93 @@ msgstr "Sėkmė"
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Priėjimas uždraustas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Kontaktas nerastas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Toks kontakto ID jau naudojamas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
-#: 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 "Nutraukta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Autentikacija Nepavyko"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Būtina Autentifikacija"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS Negalimas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adresų Knyga neegzistuoja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Ar nori išsaugoti pakeitimus?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Atsikratyti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Klaida pridedant sąrašą"
 
-#: 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 "Klaida įtraukiant kontaktą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Klaida keičiant kontaktą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Klaida pašalinant sąrašą"
 
-#: 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 "Klaida šalinant kontaktą"
 
-#: 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"
@@ -3010,7 +3055,7 @@ msgstr ""
 "Bandymas atverti %d kontaktus sukurs %d naujų langų.\n"
 "Ar Jūs tikrai norite peržiūrėti visus šiuos kontaktus vienu metu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3019,50 +3064,50 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori įrašyti vietoj jo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Perrašyti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Klaida saugant %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 "kortele.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "sąrašas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Perkelti kontaktą į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Nukopijuoti kontaktą į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Perkelti kontaktus į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Nukopijuoti kontaktus į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Keletas VCard kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -3099,33 +3144,32 @@ msgstr "Pridėti adresą prie esančio kontakto „%s“"
 msgid "Querying Address Book..."
 msgstr "Užklausiama adresų knygelė..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Keisti kontakto informaciją"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Įlieti el. pašto adresą"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "ir %d kitus kontaktus."
-
-#: 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 "ir likusį kontaktą."
+msgid_plural "and %d other contacts."
+msgstr[0] "ir likusį kontaktą."
+msgstr[1] "ir likusį kontaktą."
+msgstr[2] "ir likusį kontaktą."
 
-#: 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 "Rodyti Visą VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Rodyti Paprastą VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Išsaugoti adresų knygelėje"
 
@@ -3276,7 +3320,7 @@ msgstr "Paraštės"
 msgid "Number of columns:"
 msgstr "Stulpelių skaičius:"
 
-#: 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 "Parinktys"
 
@@ -3458,7 +3502,7 @@ msgid "Unnamed List"
 msgstr "Bevardis Sąrašas"
 
 #: 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 "Įveskite slaptažodį"
 
@@ -3536,7 +3580,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution Užduočių komponentas"
 
 #: 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"
@@ -3582,26 +3626,26 @@ msgstr "Užtildymo laikas (minutėmis)"
 msgid "_Edit appointment"
 msgstr "K_eisti įvykį"
 
-#: 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 "Atidaryti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 #, fuzzy
 msgid "Dismiss"
 msgstr "A_tšaukti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 #, fuzzy
 msgid "Dismiss All"
 msgstr "_Atšaukti Visus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Nėra jokios aprašymo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3614,12 +3658,12 @@ msgstr ""
 "Prasideda %s\n"
 "Baigiasi %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 "Įspėjimas"
 
-#: 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"
@@ -3631,7 +3675,7 @@ msgstr ""
 "siųstų laišką.  Evolution vietoj to parodys normalų\n"
 "užuominos dialogą."
 
-#: 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 "
@@ -3648,7 +3692,7 @@ msgstr ""
 "\n"
 "Ar Jūs esate tikras, kad ši komanda turi būti paleista?"
 
-#: 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 "Kitą kartą nebeklausti apie šią programą."
 
@@ -3815,13 +3859,13 @@ msgstr "Komentaras turi savyje"
 msgid "Location contains"
 msgstr "Aprašymas turi savyje"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Netinkantys"
 
-#: 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 "Kalendorius"
 
@@ -3839,7 +3883,7 @@ msgid "Purge events older than"
 msgstr "Ištrinti įvykius senesnius nei"
 
 #: 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 "dienų"
 
@@ -3850,7 +3894,7 @@ msgstr "%A, %Y m. %B %d d."
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3872,70 +3916,70 @@ msgstr "%Y m. %B %d d."
 msgid "%d %B"
 msgstr "%B %d"
 
-#: 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 "Bus pašalintas kalendorius „%s“. Ar Jūs tikrai norite taip pasielgti?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Naujas Kalendorius"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Naujas paskyrimas"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "P_askyrimas"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Sukurti naują įvykį"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Naujas susitikimas"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "_Susitikimas"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Sukurti naują susitikimo užklausimą"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Nauji visos dienos paskyrimai"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Visos dienos praskyrimai"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr "Sukurti naują visos dienos paskyrimą"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Naujas kalendorius"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "K_alendorius"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
-#: 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 "Nepavyko atverti kalendoriaus „%s“ įvykių bei susitikimų įrašymui"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nėra sukurta kalendoriaus naudojamo įvykių bei susitikimų saugojimui"
 
@@ -3965,10 +4009,6 @@ msgstr "Savaitės rodinys"
 msgid "Month View"
 msgstr "Mėnesio rodinys"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Sąrašo vaizdas"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Klaida atidarant kalendorių"
@@ -3986,16 +4026,16 @@ msgstr "Turimos priėjimo teisės neleidžia atidaryti kalendoriaus"
 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 "Nepavyko atidaryti aplanko tarp „%s“"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI, kurį rodys kalendorius"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Naudojamas rodynio tipas"
 
@@ -4059,11 +4099,11 @@ msgstr "dialogas1"
 msgid "extra times every"
 msgstr "papildomai kiekvieną"
 
-#: 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 "valandų"
 
-#: 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 "minučių"
 
@@ -4086,11 +4126,11 @@ msgstr "Pagrindai"
 msgid "Date/Time:"
 msgstr "Data/Laikas:"
 
-#: 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 "Rodyti pranešimą"
 
-#: 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 "Groti garsą"
 
@@ -4098,17 +4138,17 @@ msgstr "Groti garsą"
 msgid "Reminders"
 msgstr "Priminėjai"
 
-#: 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 "Paleisti programą"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr "Siųsti el. Laišką"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Pasiųsti laišką"
 
 #: 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 "Apžvalga:"
@@ -4139,7 +4179,7 @@ msgid "hour(s)"
 msgstr "valandą(as)"
 
 #: 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 "minutę(es)"
 
@@ -4149,8 +4189,8 @@ msgstr "įvykio pradžią"
 
 #. 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 "Įjungta"
 
@@ -4166,19 +4206,19 @@ msgstr "Neimportuoti"
 
 #: 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 "Išjungti"
 
 #: 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 "Įjungti"
 
@@ -4202,7 +4242,7 @@ msgstr "30 minučių"
 msgid "60 minutes"
 msgstr "60 minučių"
 
-#: 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 "Perspėjimai"
 
@@ -4227,7 +4267,7 @@ msgid "Days"
 msgstr "Dienų"
 
 #: 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 "Įju_ngti"
 
@@ -4322,7 +4362,7 @@ msgid "Wednesday"
 msgstr "Trečiadienis"
 
 #: 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 "Darbo savaitė"
 
@@ -4367,7 +4407,6 @@ msgid "_Fri"
 msgstr "Pe_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Esmė"
 
@@ -4466,7 +4505,7 @@ msgstr ""
 "Paspauskite „Pabaigti“ mygtuką, kad išsaugoti dabar įvestus nustatymus."
 
 #: 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 "Naujas Užduočių sąrašas"
 
@@ -4626,28 +4665,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Tikrinimo klaida: %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 " iki "
 
-#: 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 " (Užbaigta "
 
-#: 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 "Užbaigta "
 
-#: 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 " (Iki "
 
-#: 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 "Iki"
 
@@ -4683,8 +4722,9 @@ msgstr "Žurnalo įrašas -- %s"
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: 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 "Išsaugoti kaip..."
 
@@ -4699,35 +4739,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Nepavyko paleisti turimos versijos!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Nepavyko atidaryti „%s“: %s"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Paskirties vieta"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Nurodykite galutinį dokumentą"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Kalendorius"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Naujas užduočių sąrašas"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4756,19 +4781,28 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ar tu tikrai nori ištrinti šį bevardį žurnalo įrašą?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Ar tu tikrai nori ištrinti %d įvykių?"
+#, 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] "Ar tu tikrai nori ištrinti %d įvykių?"
+msgstr[1] "Ar tu tikrai nori ištrinti %d įvykių?"
+msgstr[2] "Ar tu tikrai nori ištrinti %d įvykių?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Ar tu tikrai nori ištrinti %d užduočių?"
+#: 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] "Ar tu tikrai nori ištrinti %d užduočių?"
+msgstr[1] "Ar tu tikrai nori ištrinti %d užduočių?"
+msgstr[2] "Ar tu tikrai nori ištrinti %d užduočių?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+#: 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] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+msgstr[1] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+msgstr[2] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4830,7 +4864,7 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: 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 "Įvykis"
 
@@ -4903,8 +4937,6 @@ msgstr "Kalendorius:"
 
 #: 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 "Klasifikacija"
 
@@ -4955,13 +4987,13 @@ msgstr "_Pradžios laikas:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Joks"
 
@@ -5018,13 +5050,13 @@ msgid "Member"
 msgstr "Narys"
 
 #: 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
@@ -5195,7 +5227,7 @@ msgid "_No recurrence"
 msgstr "_Jokio pakartojimo"
 
 #: 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 "_Pašalinti"
 
@@ -5237,7 +5269,7 @@ msgstr ""
 "\n"
 "Ar norėtumėte išsaugoti pakeitimus?"
 
-#: 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 "_Atsikratyti Pakeitimų"
 
@@ -5245,6 +5277,28 @@ msgstr "_Atsikratyti Pakeitimų"
 msgid "Save Event"
 msgstr "Išsaugoti Įvykį"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Pasirink importavimo komponentą"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Nurodykite galutinį dokumentą"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendorius"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Naujas užduočių sąrašas"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Susitikimo informacija buvo sukurta. Ar ją išsiųsti?"
@@ -5274,39 +5328,39 @@ msgstr "% _Baigta"
 #: 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 "Užbaigta"
 
 #: 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 "Aukštas"
 
 #: 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 "Vykdoma"
 
 #: 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 "Žemas"
 
 #: 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 "Normalus"
 
 #: 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 "Nepradėta"
 
@@ -5320,7 +5374,8 @@ msgid "Undefined"
 msgstr "Neapibrėžtas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "Užbaigimo _data:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5363,9 +5418,9 @@ msgstr "Nepavyko atverti „%s“ užduočių."
 msgid "Con_fidential"
 msgstr "S_laptas"
 
-#: 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 "Aprašymas:"
 
@@ -5374,11 +5429,13 @@ msgid "Folder:"
 msgstr "Aplankas:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "P_radžios data:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Kada reikia:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5439,136 +5496,118 @@ msgid "Weekly"
 msgstr "Savaitė"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d dienų"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 diena"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d savaičių"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 savaitė"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d valandų"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 valanda"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minučių"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dienų"
+msgstr[1] "%d dienų"
+msgstr[2] "%d dienų"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minutė"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d savaičių"
+msgstr[1] "%d savaičių"
+msgstr[2] "%d savaičių"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundžių"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d valandų"
+msgstr[1] "%d valandų"
+msgstr[2] "%d valandų"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekundė"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minučių"
+msgstr[1] "%d minučių"
+msgstr[2] "%d minučių"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Pasiųsti laišką"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundžių"
+msgstr[1] "%d sekundžių"
+msgstr[2] "%d sekundžių"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Nežinomas veiksmas, kurį reikia atlikti"
 
-#: 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 prieš įvykio pradžią"
 
-#: 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 po įvykio pradžios"
 
-#: 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 įvykio pradžios metu"
 
-#: 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 prieš įvykio pabaigą"
 
-#: 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 po įvykio pabaigos"
 
-#: 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 įvykio pabaigos metu"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s tarp %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 yra skirtas nežinomam daviklio tipui"
 
-#: 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 "Viešas"
 
-#: 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 "Asmeniškas"
 
-#: 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 "Slaptas"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Aprašymas"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Data"
 
-#: 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 "Pradžios data"
 
-#: 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 "Apžvalga"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "spalva"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "komponentas"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Laisvas"
@@ -5604,141 +5643,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 "Taip"
 
-#: 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 "Ne"
 
 #. 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 "Nežinomas"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Trinami pasirinkti objektai"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Atnaujinami objektai"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Naujas į_vykis..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Naujas visos _dienos įvykis"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Naujas Susitikimas"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Nauja užduotis"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "S_pausdinti..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "Į_dėti"
-
-#: 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 "Eiti į šia_ndieną"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Eiti į datą..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Skelbti laisvas/užimtas informaciją"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "Ati_daryti"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "Iš_saugoti kaip..."
-
-#: 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 "_Iškirpti"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopijuoti"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Suplanuoti Susitikimą..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Persiųsti kaip iCalendar..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Ištrinti šį _pasitaikymą"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Ištrinti _visus pasitaikymus"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "Nuo_statos..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5783,32 +5720,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 "Trinami pasirinkti objektai"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Atnaujinami objektai"
+
+#: 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 "Ati_daryti"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Atverti Tinklapį"
 
-#: 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 "Iš_saugoti kaip..."
+
+#: 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 "S_pausdinti..."
+
+#: 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 "_Iškirpti"
+
+#: 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 "_Kopijuoti"
+
+#: 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 "Į_dėti"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Priskirti užduotį"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Persiųsti kaip iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "_Pažymėti užbaigta"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pažymėti Pasirinktas Užduotis kaip Užbaigtas"
 
-#: 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 "_Ištrinti pažymėtas užduotis"
 
-#: 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 "Spausk čia, kad pridėtum užduotį"
 
@@ -5817,38 +5807,101 @@ msgstr "Spausk čia, kad pridėtum užduotį"
 msgid "% Complete"
 msgstr "% Baigta"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Perspėjimai"
-
-#: 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 "Užbaigta"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Užbaigimo data"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Kada reikia"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Geografinė vietovė"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Svarbumas"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Pradžios data"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Užduočių rikiavimas"
 
-#: 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 "Naujas į_vykis..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Naujas visos _dienos įvykis"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Naujas Susitikimas"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Nauja užduotis"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Pažymėti _giją"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Pa_srinkite..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Skelbti laisvas/užimtas informaciją"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Kopijuoti į aplanką..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Perkelti į Aplanką..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Suplanuoti Susitikimą..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Persiųsti kaip iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Ištrinti šį _pasitaikymą"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Ištrinti _visus pasitaikymus"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Eiti į šia_ndieną"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Eiti į datą..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "Nuo_statos..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5880,26 +5933,26 @@ msgstr "%02i minučių padalos"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr " "
@@ -5908,106 +5961,104 @@ msgstr " "
 msgid "Yes. (Complex Recurrence)"
 msgstr "Taip. (Sudėtingas Pasikartojimas)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Kasdien"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Kas %d dienų"
+msgid_plural "Every %d days"
+msgstr[0] "Kasdien"
+msgstr[1] "Kasdien"
+msgstr[2] "Kasdien"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Kiekvieną savaitę"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Kas %d savaičių"
+msgid_plural "Every %d weeks"
+msgstr[0] "Kiekvieną savaitę"
+msgstr[1] "Kiekvieną savaitę"
+msgstr[2] "Kiekvieną savaitę"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Kiekvienos savaitės dieną"
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Kiekvienos %d savaitės dieną"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Kiekvienos savaitės dieną"
+msgstr[1] "Kiekvienos savaitės dieną"
+msgstr[2] "Kiekvienos savaitės dieną"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " ir "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s dieną iš  "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s iš "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "kiekvieną mėnesį"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "kas %d mėnesių"
+msgid_plural "every %d months"
+msgstr[0] "kiekvieną mėnesį"
+msgstr[1] "kiekvieną mėnesį"
+msgstr[2] "kiekvieną mėnesį"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Kasmet"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Kas %d metų"
+msgid_plural "Every %d years"
+msgstr[0] "Kasmet"
+msgstr[1] "Kasmet"
+msgstr[2] "Kasmet"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " bendrai %d kartų"
+#: 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] " bendrai %d kartų"
+msgstr[1] " bendrai %d kartų"
+msgstr[2] " bendrai %d kartų"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", pabaigiant "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Pradžia:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Pabaiga:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Baigta:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Iki:</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 Informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar Klaida"
 
-#: 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 "Nežinomas asmuo"
 
 #. 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."
@@ -6015,316 +6066,320 @@ msgstr ""
 "<br> Peržiūrėkite žemiau esančią informaciją ir tada pasirinkite reikiamą "
 "apatinio meniu punktą."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Joks</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Vieta:"
+
 #. 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 "Būsena:"
 
-#: 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 "Priimtas"
 
-#: 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 "Negalutinis Sutikimas"
 
-#: 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 "Atmestas"
 
-#: 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 "Pasirinkti veiksmą:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: 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 "Gerai"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Priimti"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Sutikti, bet negarantuoti"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr " Atmesti "
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Siųsti Laisvas/Užimtas Informaciją"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Atnaujinti gavėjų statusą"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Nusiųsti Paskutinę Informaciją"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: 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> paskelbė susitikimo informaciją."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: 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> norėtų, kad %s dalyvautų susitikime."
 
-#: 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> norėtų, kad Jūs dalyvautumėte susitikime."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Susitikimo Pasiūlymas"
 
-#: 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> nori papildyti esamą susitikimą."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Susitikimo Atnaujinimas"
 
-#: 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> norėtų gauti paskutinę informaciją apie susitikimą."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Prašymas Pakeisti Susitikimo Informaciją"
 
-#: 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> atsakė į susitikimo užklausą."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Susitikimo Atsakas"
 
-#: 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> atšaukė susitikimą."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Susitikimo Atšaukimas"
 
-#: 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> atsiuntė nesuprantamą atsakymą į užklausimą."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Blogas Susitikimo Pranešimas"
 
-#: 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> paskelbė užduoties informaciją."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Užduoties informacija"
 
-#: 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> prašo %s atlikti šią užduotį."
 
-#: 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> prašo Jus atlikti užduotį."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Užduoties Pasiūlymas"
 
-#: 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> nori papildyti esamą užduotį."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Užduoties Atnaujinimas"
 
-#: 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> nori gauti paskutinę užduoties informaciją."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Užduoties Atnaujinimo Užklausa"
 
-#: 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> atsakė į užduoties priskyrimą."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Užduoties Atsakas"
 
-#: 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> atšaukė užduotį."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Užduoties Atšaukimas"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Blogas Užduoties Pranešimas"
 
-#: 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> paskelbė laisvas/užimtas informaciją."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Laisvas/Užimtas Informacija"
 
-#: 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> paprašė Jūsų pateikti laisvas/užimtas informaciją."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Laisvas/Užimtas Prašymas"
 
-#: 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> atsakė į laisvas/užimtas prašymą."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Laisvas/Užimtas Atsakas"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Blogas Laisvas/Užimtas Pranešimas"
 
-#: 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 "Pranešimas nėra teisingai suformuotas"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Pranešime yra išvardinti tik nepalaikomi prašymai."
 
-#: 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 "Priede nėra tvarkingo kalendoriaus pranešimo"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Priede nėra peržiūrimų kalendoriaus elementų"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negalėjo būti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Atnaujinimas užbaigtas\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 ""
 "Dalyvio statusas negali būti atnaujintas, nes pasirinktas elementas "
 "nebeegzistuoja"
 
-#: 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 "Objektas yra nepriimtinas ir negali būti atnaujintas\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 ""
 "Šis atsakymas yra ne nuo esamo dalyvio. Ar įtraukti siuntėją į dalyvių "
 "sąrašą?"
 
-#: 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 ""
 "Dalyvio statusas negali būti atnaujintas, nes nurodytas neteisingas "
 "statusas!\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 "Įvyko CORBA sistemos klaida\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Objektas nerastas\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 "Jūs neturite teisių, būtinų atnaujinti kalendoriaus informaciją\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Dalyvio būsena negali būti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Pašalinimas užbaigtas"
 
-#: 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 "Elementas išsiųstas!\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 "Elementas negalėjo būti išsiųstas!\n"
 
@@ -6459,7 +6514,7 @@ msgstr "%a %Y-%m-%d"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -6541,12 +6596,12 @@ msgstr "Prioritetas:"
 msgid "Web Page:"
 msgstr "Tinklalapis:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
 msgstr "Paspauskite, kad atidaryti %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"
@@ -6556,7 +6611,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"
@@ -6564,12 +6619,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys tarp %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6578,46 +6633,48 @@ msgstr ""
 "Klaida atidarant %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Išvaloma"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Įkeliamos užduotys"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Įkeliamos užduotys"
+
+#: calendar/gui/gnome-cal.c:1799
 #, c-format
 msgid "Opening %s"
 msgstr "Atidaroma %s"
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
 msgstr "Trinama"
 
@@ -6638,45 +6695,46 @@ msgid "February"
 msgstr "Vasaris"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Eiti į datą"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Sausis"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Liepa"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Birželis"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Kovas"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Gegužė"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Lapkritis"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Spalis"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Pasirink vardus"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Rugsėjis"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Eiti į šiandieną"
+msgid "_Select Today"
+msgstr "Pasirink aplanką"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6768,7 +6826,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Gimtadieniai ir Sukaktuvės"
 
 #. 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 "Tinkle"
 
@@ -6925,81 +6983,81 @@ msgid "Sa"
 msgstr "Št"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: 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, %Y %b %d"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savaitė (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas mėnuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Užduotis"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Būklė: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritetas: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Įvykdymo Procentas: %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 "Kategorijos: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontaktai: "
 
-#: 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 "Spaudinio peržiūra"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Spausdinti elementą"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
@@ -7009,36 +7067,36 @@ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Bus pašalintas Užduočių Sąrašas „%s“. Ar Jūs tikrai norite taip pasielgti?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Užduotis"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Naujas užduočių sąrašas"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Užduočių sąrašas"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Sukurti naują užduočių sąrašą"
 
-#: 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 "Nepavyko atverti užduočių sąrašo „%s“ įvykių ir susitikimų kūrimui"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Nėra kalendoriaus, kuriame galima būtų kurti užduotis"
 
@@ -8682,7 +8740,7 @@ msgstr "Nepavyko sukurti podėlio kelio"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nepavyko pašalinti podėlio įrašo: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8693,7 +8751,7 @@ msgstr ""
 "Tolimesni veiksmai šiame serveryje nebus iš tikro įvykdyti,\n"
 "tau vėl prisijungus prie tinklo."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8704,7 +8762,7 @@ msgstr ""
 "%s\n"
 "Pakeitimai, padaryti šiam aplankui, nebus vėl sinchronizuojami."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Vėl sinchronizuojama su serveriu"
 
@@ -8721,7 +8779,7 @@ msgstr "Atsisiunčiami nauji laiškai darbui atsijungusiame režime"
 msgid "Preparing folder '%s' for offline"
 msgstr "Aplankas „%s“ ruošiamas atsijungusiam darbui"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijungęs, kad užbaigtum šį veiksmą"
 
@@ -8836,30 +8894,34 @@ msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma užklausa nežinomai antraštei: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepalaikoma operacija: įterpti laišką: dėl %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepalaikoma operacija: paieška pagal išraiška: skirta %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepalaikoma operacija: paieška pagal uid: skirta %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Perkeliami laiškai"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Kopijuojami pranešimai"
 
-#: 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 "Filtruojami nauji pranešimai"
 
@@ -8893,7 +8955,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 "Nutraukta."
 
@@ -9272,7 +9335,7 @@ msgstr "Pateiktas mandatas yra pasenęs."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas iš serverio."
 
@@ -9470,7 +9533,7 @@ msgstr "Apdorojimo klaida"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Pasirašė: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nepavyko pasiekti aplanko: Neleistina šios saugyklos operacija"
 
@@ -9479,21 +9542,22 @@ msgstr "Nepavyko pasiekti aplanko: Neleistina šios saugyklos operacija"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nepavyko sukurti aplanko: Neleistina šios saugyklos operacija"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Šiukšlės"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Šiukšlės"
 
@@ -9724,17 +9788,17 @@ msgstr "Nėra tokio laiško %s aplanke %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
@@ -9768,34 +9832,33 @@ msgstr "Pritaikyti filtrus naujiems laiškams šio serverio INBOX aplanke"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatiškai sulyginti nutolusį ir vietinį paštą"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "LDAP Serveriai"
+msgid "Address Book And Calendar"
+msgstr "Adresų _Knyga:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Paieškos sritis:"
+#: 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
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "Skirtas pasiekti Novel Groupwise serverius"
 
-#: 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 "Slaptažodis"
 
-#: 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."
@@ -9803,8 +9866,8 @@ msgstr ""
 "Su šia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slaptažodis."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "sąrašas"
@@ -9812,12 +9875,12 @@ msgstr "sąrašas"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netikėtai atsijungė: %s"
@@ -9875,12 +9938,12 @@ msgstr "Aplankas serveryje buvo sunaikintas ir vėl sukurtas."
 msgid "Scanning for changed messages"
 msgstr "Ieškoma pakeistų laiškų"
 
-#: 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 "Nepavyko gauti laiško: %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
@@ -9896,25 +9959,25 @@ msgstr ""
 "Negaliu gauti laiško: %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 "Nėra tokio laiško"
 
-#: 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 "Šis laiškas šiuo metu nepasiekiamas"
 
-#: 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 "Atsiunčiama naujų laiškų santrauka"
 
-#: 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 "Negalėjau rasti laiško teksto FETCH atsakyme"
 
@@ -9987,18 +10050,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pašto skaitymui ir rašymui IMAP serveriuose."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP serveris %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 tarnyba, skirta %s tarp %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
@@ -10008,14 +10071,14 @@ msgstr "IMAP tarnyba, skirta %s tarp %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Negalėjau prisijungti prie %s (prievadas %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 nepasiekiamas"
 
-#: 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
@@ -10023,49 +10086,49 @@ msgstr "SSL nepasiekiamas"
 msgid "Connection cancelled"
 msgstr "Jungtis nutraukta"
 
-#: 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 "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %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 išplėtimas nepalaikomas."
 
-#: 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 komunikacijų klaida"
 
-#: 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 "Nepavyko prisijungti naudojant komandą „%s“: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s nepalaiko prašyto autentikacijos tipo %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPrašom įvesti IMAP slaptažodį dėl %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Tu neįvedei slaptažodžio."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10075,32 +10138,33 @@ msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Nėra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%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:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%c“"
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nežinomas aukštesnysis aplankas: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Tėvinis aplankas negali turėti vaikinių aplankų"
 
@@ -10136,20 +10200,20 @@ msgid "Index message body data"
 msgstr "Suindeksuoti žinutės teksto duomenis"
 
 #. $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 "dėžutė:%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)"
@@ -10211,7 +10275,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"
@@ -10260,8 +10324,8 @@ msgstr "Negalėjau ištrinti aplanko santraukos bylos „%s“: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Negalėjau ištrinti aplanko indekso bylos „%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 "Nepavyko ištrinti aplanko meta bylos „%s“: %s"
@@ -10291,14 +10355,14 @@ msgstr "Blogas laiško turinys"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Negalėjau gauti aplanko „%s“: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Nėra tokio aplanko „%s“."
@@ -10317,7 +10381,7 @@ msgstr "„%s“ nėra maildir katalogas."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negalėjau ištrinti aplanko „%s“: %s"
@@ -10326,28 +10390,28 @@ msgstr "Negalėjau ištrinti aplanko „%s“: %s"
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nepavyko peržiūrėti aplanko „%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 "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Tikrinamas aplanko vientisumas"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: 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
@@ -10395,7 +10459,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti laiško: Sugadinta pašto dėžutė?"
 
 #: 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 "Negalima sukurti aplanko su tokiu vardu"
 
@@ -10425,30 +10489,30 @@ msgstr "„%s“ nėra paprasta byla."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas „%s“ nėra tuščias. Neištryniau."
 
-#: 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 "Negaliu sukurti katalogo „%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 "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
 msgstr "Toks aplankas jau yra"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
 msgstr "Naujasis aplanko vardas yra neleistinas."
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nepavyko pervardinti „%s“: %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Negalima pervardinti %s į %s: %s"
@@ -10492,7 +10556,7 @@ msgstr "Negalėjau uždaryti šaltinio aplanko %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Negalėjau uždaryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negalėjau pervadinti aplanko: %s"
@@ -10535,14 +10599,14 @@ msgstr "Laiško įterpimas į MH atšauktas"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Negalėjau sukurti aplanko: „%s“:\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Negalėjau gauti aplanko „%s“: %s"
@@ -10818,46 +10882,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "Jungimosi klaida: %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 "Nėra tokio aplanko: %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 "Nepavyko gauti grupės: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komandos klaida: %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: Ieškoma naujų laiškų"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nežinomas serverio atsakymas: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Naudoti atšaukimą"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacijos klaida: %s"
@@ -10904,7 +10968,7 @@ msgstr "Ištrinti po %s dienos(ų)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Atjungti visų POP3 išplėtimų palaikimą"
 
-#: 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"
 
@@ -10994,7 +11058,7 @@ msgid "No such folder `%s'."
 msgstr "Nėra tokio aplanko „%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"
 
@@ -11047,12 +11111,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pašto siuntimas per 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 ""
 "Pašto siuntimui, prisijungiant prie nutolusio pašto serverio naudojant "
 "SMTP.\n"
@@ -11172,13 +11237,14 @@ msgid "server does not appear to support SSL"
 msgstr "panašu, kad serveris nepalaiko SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "Baigėsi STARTTLS užklausos laiko riba: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "Nepavyko IMAP komanda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS atsakymo klaida"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "Nepavyko IMAP komanda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11211,154 +11277,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP pašto siuntimas per %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Negaliu siųsti laiško: neapibrėžti jokie gavėjai."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Negaliu siųsti laiško: siuntėjo adresas neteisingas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Siunčiamas laiškas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu siųsti laiško: neapibrėžti jokie gavėjai."
 
-#: 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 "Nepavyko išsiųsti laiško: dalis adresatų yra neteisingi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "Baigėsi HELO užklausos laiko riba: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO atsakymo klaida"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objektą."
 
-#: 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 "Baigėsi AUTH užklausos laiko riba: %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 "Nepavyko IMAP komanda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH užklausa nepavyko."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "Nepavyko IMAP komanda: %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 "Blogas autentikacijos atsakymas iš serverio.\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 "Baigėsi MAIL FROM užklausos laiko riba: %s: paštas neišsiųstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM atsakymo klaida"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "Nepavyko IMAP komanda: %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 "Baigėsi RCPT TO užklausos laiko riba: %s: paštas neišsiųstas"
 
-#: 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> klaida"
 
-#: 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 "Baigėsi DATA užklausos laiko riba: %s: paštas neišsiųstas"
 
 #. 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 atsakymo klaida"
-
-#: 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 ""
-"Baigėsi DATA siuntimo laiko riba: laiško nutraukimas: %s: paštas neišsiųstas"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA pabaigos patvirtinimo klaida"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "Nepavyko IMAP komanda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "Baigėsi RSET užklausos laiko riba: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET atsakymo klaida"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "Baigėsi QUIT užklausos laiko riba: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT atsakymo klaida"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "Nepavyko IMAP komanda: %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 "priedas"
 
-#: 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 "Pašalinti pažymėtus elementus iš priedų sąrašo"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Prisegti priedą..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Prisegti bylą prie šio laiško"
 
-#: 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 "Negalėjau prisegti bylos %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 "Negaliu prisegti bylos %s: ne paprasta byla"
@@ -11380,21 +11449,21 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasiūlyti automatinį priedo parodymą"
 
-#: 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 ""
 "Jūs turite nustatyti savo pašto sąskaitos parametrus prieš pradėdami kurti "
 "laiškus."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Paskirties vieta"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Pasirinkite aplanką, kuriame bus patalpintas laiškas."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Paspausk čia, jei reikia adresų knygelės"
 
@@ -11405,45 +11474,45 @@ msgstr "Paspausk čia, jei reikia adresų knygelės"
 #. * 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 "Atsakyti-kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Įvesk laiško gavėjus"
 
-#: 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 "Įvesk adresus, kurie gaus šio laiško carbon copy"
 
-#: 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."
@@ -11454,11 +11523,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Skelbti Tarp:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
 msgstr "Spausk čia, kad pasirinktum aplanką"
 
@@ -11466,14 +11535,14 @@ msgstr "Spausk čia, kad pasirinktum aplanką"
 msgid "Attach file(s)"
 msgstr "Prisegti bylą(as)"
 
-#: 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 ""
 "Negalima pasirašyti išsiunčiamo laiško: Nenustatytas šios sąskaitos parašo "
 "sertifikatas"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11481,7 +11550,7 @@ msgstr ""
 "Negalima užkoduoti išsiunčiamo laiško: Nenustatytas šios sąskaitos kodavimo "
 "sertifikatas"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11490,30 +11559,30 @@ msgstr ""
 "Klaida skaitant bylą %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, užrašyti?"
 
-#: 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 "Klaida išsaugant bylą: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida įkeliant bylą: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti laiško iš redaktoriaus"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11522,7 +11591,7 @@ msgstr ""
 "Paieška byloje nepavyko: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11531,7 +11600,7 @@ msgstr ""
 "Nepavyko sumažinti bylos: %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"
@@ -11540,7 +11609,7 @@ msgstr ""
 "Nepavyko nukopijuoti bylos rodiklio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11549,7 +11618,7 @@ msgstr ""
 "Klaida automatiškai išsaugant laišką: %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?"
@@ -11557,7 +11626,7 @@ msgstr ""
 "Ximian Evolution rado neišsaugotų laiškų iš praeitos sesijos.\n"
 "Ar norėtumėte pabandyti juos atkurti?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11569,22 +11638,27 @@ msgstr ""
 "Ar norėtumėte jį išsaugoti?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Keletas laiškų"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Įspėjimas: Pakeistas laiškas"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Atidaryti bylą"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Parašas:"
-
-#: 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 "Autogeneruotas"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Parašas:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -11592,20 +11666,20 @@ msgstr[0] "<b>%d</b> Prikabinta Byla"
 msgstr[1] "<b>%d</b> Prikabintos Bylos"
 msgstr[2] "<b>%d</b> Prikabinta Bylų"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Paslėpti _Priedų Juosta (meskite priedus čia)"
 
-#: 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 "Rodyti _Priedų Juostą (meskite priedus čia)"
 
-#: 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 "Sukurti laišką"
 
-#: 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."
@@ -11613,7 +11687,7 @@ msgstr ""
 "Nepavyko sukurti laiškų rašymo lango:\n"
 "Nepavyko aktyvuoti adresų pasirinkimo valdymo."
 
-#: 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"
@@ -11625,7 +11699,7 @@ msgstr ""
 "Įsitikinkite, kad pas Jus įdiegtos tinkamos gtkhtml bei\n"
 "libgtkhtml versijos.\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."
@@ -11633,7 +11707,7 @@ msgstr ""
 "Negalėjau sukurti rašyklės lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11757,7 +11831,7 @@ msgstr ""
 "Ką Evolution turi daryti Jums gavus laišką su prašymu patvirtinti "
 "perskaitymą?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11765,15 +11839,15 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "Užrašyti ją?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Užrašyti bylą?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Prisiminti šį slaptažodį"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Prisiminti šį slaptažodį iki šios sesijos galo"
 
@@ -11856,13 +11930,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11871,118 +11945,113 @@ 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 "prieš 1 sekundę"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "prieš %d sekundžių"
+msgid_plural "%d seconds ago"
+msgstr[0] "prieš 1 sekundę"
+msgstr[1] "prieš 1 sekundę"
+msgstr[2] "prieš 1 sekundę"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "prieš 1 minutę"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "prieš %d minučių"
+msgid_plural "%d minutes ago"
+msgstr[0] "prieš 1 minutę"
+msgstr[1] "prieš 1 minutę"
+msgstr[2] "prieš 1 minutę"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "prieš 1 valandą"
+msgid_plural "%d hours ago"
+msgstr[0] "prieš 1 valandą"
+msgstr[1] "prieš 1 valandą"
+msgstr[2] "prieš 1 valandą"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "prieš %d valandų"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "prieš 1 dieną"
+msgid_plural "%d days ago"
+msgstr[0] "prieš 1 dieną"
+msgstr[1] "prieš 1 dieną"
+msgstr[2] "prieš 1 dieną"
 
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "prieš %d dienų"
-
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "prieš 1 savaitę"
+msgid_plural "%d weeks ago"
+msgstr[0] "prieš 1 savaitę"
+msgstr[1] "prieš 1 savaitę"
+msgstr[2] "prieš 1 savaitę"
 
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "prieš %d savaičių"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "prieš 1 mėnesį"
-
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "prieš %d mėnesių"
+msgid_plural "%d months ago"
+msgstr[0] "prieš 1 mėnesį"
+msgstr[1] "prieš 1 mėnesį"
+msgstr[2] "prieš 1 mėnesį"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "prieš 1 metus"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "prieš %d metų"
+msgid_plural "%d years ago"
+msgstr[0] "prieš 1 metus"
+msgstr[1] "prieš 1 metus"
+msgstr[2] "prieš 1 metus"
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Jūs turite pasirinkti datą."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<spausk čia, kad pasirinktum datą>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "dabar"
 
 #. 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 "%Y %m %d"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Pasirink laiką, su kuriuo palyginti"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Filtravimo taisyklės"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
 msgstr "Jūs turite nurodyti bylos vardą."
 
-#: 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 "Byla „%s“ neegzistuoja arba nėra standartinė byla."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Pasirinkite bylą"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Tada"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Laikas</b>"
 
 #: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Jūs turite nurodyti aplanką."
 
-#: 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 "Pasirink aplanką"
 
@@ -11996,23 +12065,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 "Svarbus"
 
 #. 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 "Darbai"
 
 #. 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 "Vėliau"
 
-#: 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 "Bandyti"
 
@@ -12020,59 +12089,63 @@ msgstr "Bandyti"
 msgid "You must name this filter."
 msgstr "Jūs turite suteikti šiam filtrui vardą."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Taisyklės pavadinimas:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Bevardė"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Jeigu"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Laikas</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Įvykdyti veiksmus"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "jei visos sąlygos tenkinamos"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "jei kuri nors sąlyga tenkinama"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "siunčiamas"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Palyginti su"
+msgid "    "
+msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Keisti filtrus"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filtravimo taisyklės"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Keisti vAplankus"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vAplankų šaltiniai"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Palyginti su"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Gaunamas"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Siunčiamas"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12080,7 +12153,7 @@ msgstr ""
 "Laiško data bus palyginta su nurodytos datos\n"
 "vidurdieniu."
 
-#: 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."
@@ -12088,7 +12161,7 @@ msgstr ""
 "Laiško data bus palyginta su laiku, santykiniu\n"
 "filtro paleidimo laikui."
 
-#: 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."
@@ -12096,59 +12169,51 @@ msgstr ""
 "Laiško data filtravimo metu bus palyginta su \n"
 "dabar esančiu laiku."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtualūs aplankai"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "laikas, santykinis esamam laikui"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr " "
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "mėnesių"
 
-#: 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 "sekundžių"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "tik nurodyti aplankai"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "esamas laikas"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "Jūsų nurodytas laikas"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vAplankų šaltiniai"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "savaičių"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "su visais aktyviais nutolusiais aplankais"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "su visais vietiniais aplankais"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "metų"
 
@@ -12282,7 +12347,7 @@ msgstr "nėra pažymėtas"
 msgid "Junk Test"
 msgstr "Birželis"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Užrašas"
@@ -12314,8 +12379,9 @@ msgid "Move to Folder"
 msgstr "Perkelti į aplanką"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Nusiųsti Laišką Aplinkos Komandai"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Išeiti iš programos"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12349,23 +12415,24 @@ msgstr "gražina reikšmę didesnę už"
 msgid "returns less than"
 msgstr "gražina reikšmę mažesnę už"
 
-#: 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 "Paleisti 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 "Įvertis"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Siuntėjas"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Priskirti būseną"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Aplinkos komanda"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
@@ -12390,9 +12457,9 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdymą"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Tema"
@@ -12401,17 +12468,13 @@ msgstr "Tema"
 msgid "Unset Status"
 msgstr "Atšaukti Būseną"
 
-#: 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 "Taisyklė vardu „%s“ jau yra. Pasirinkite kitą vardą."
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Taisyklės"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Pridėti taisyklę"
 
@@ -12423,8 +12486,9 @@ msgstr "Keisti taisyklę"
 msgid "Rule name"
 msgstr "Taisyklės pavadinimas"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Įverčio taisyklės"
 
 #: filter/searchtypes.xml.h:1
@@ -12459,15 +12523,20 @@ msgstr "Temoje yra"
 msgid "Subject does not contain"
 msgstr "Temoje nėra"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtualūs aplankai"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Jūs turite įvardinti ši virtualų aplanką."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tu turi nurodyti bent vieną aplanką kaip šaltinį"
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
 msgstr "VFolder išeities tekstas"
 
@@ -12520,8 +12589,8 @@ msgstr "Evolution Pašto aplanko vaizduoklė"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Pašto nustatymų valdymas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Paštas"
@@ -12530,53 +12599,50 @@ msgstr "Paštas"
 msgid "Mail Accounts"
 msgstr "Pašto Sąskaitos"
 
-#: 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 "Pašto Nustatymai"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori ištrinti šią sąskaitą?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Neištrinti"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Įprasta]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Sąskaitos vardas"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: 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 "Bevardis"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 msgid "You must specify a valid script name."
 msgstr "Jūs turite nurodyti tinkamą scenarijaus vardą."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[scenarijus]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 msgid "Language(s)"
 msgstr "Kalba(os)"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Pridėti parašo scenarijų"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Pridėti Parašą"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
 msgstr "Parašas(ai)"
 
@@ -12634,7 +12700,7 @@ msgstr ""
 "Nepavyko atidaryti šios sąskaitos juodraščių aplanko.\n"
 "Ar norėtum naudoti įprastinį juodraščių aplanką?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _Virtualų Aplanką pagal Paiešką..."
 
@@ -12664,289 +12730,319 @@ msgstr "Neskaitytos žinutės"
 msgid "<click here to select a folder>"
 msgstr "<spausk čia, kad pasirinktum aplanką>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Sukurti Naują Aplanką"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplanką:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Gauti laiškai"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Įkeliama..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Trinamas aplankas %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Atidaromas aplankas %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Laiškai perkeliami į %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Laiškai kopijuojami į %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Pasirink aplanką"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Įrašomas aplankas '%s'"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Sukurti aplanką"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nepavyko ištrinti aplanko: %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Ar tikrai norite ištrinti aplanką „%s“ ir visus su juo susijusius aplankus?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ištrinti \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
 msgstr "Pervadinti Aplanką"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Jau yra aplankas pavadintas „%s“. Pasirinkite kitą vardą."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Rodyti"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
 msgstr "Atidaryti _Naujame Lange"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
 msgstr "_Perkelti"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
 msgstr "_Naujas Aplankas..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Savybės..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip naują laišką..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "Tęsinys..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Pažymėti Bai_gtu"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Atša_ukti Pažymėjimą"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Pažymėti s_kaitytu"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Pažymėti _Neskaitytu"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Pažymėti Nes_varbiu"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Pažymėti kaip _Šiukšlę"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Atšaukti Šiukšlės _Pažymėjimą"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti į Aplanką..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Įtraukti Siuntėją į Adresų _Knygą"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "Pritaik_yti Filtrus"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Filtravimo taisyklės"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "Sukur_ti Filtrą pagal Laišką"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Temą"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntėją"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gavėjus"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferenciją"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
 msgstr "vAplankas pagal Tąsą"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_emą"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_untėją"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_vėjus"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferenciją"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
 msgstr "Filtras pagal Tąsą"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Įprastas"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
 msgstr "_Kopijuoti Nuorodą"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
 msgstr "Paspauskite, kad išsiųsti %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 "Atitinka: %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 "Nepasirašytas"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -12955,11 +13051,11 @@ msgstr ""
 "Šis laiškas nėra pasirašytas. Nėra jokių garantijų, kad laiško siuntėjas yra "
 "būtent tas asmuo, kurio vardas įrašytas laiške."
 
-#: 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 "Tvarkingas parašas"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -12968,11 +13064,11 @@ msgstr ""
 "Šis laiškas yra tvarkingai pasirašytas. Laiško siuntėjas turėtų būti būtent "
 "tas, kuo teigia esąs."
 
-#: 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 "Netvarkingas parašas"
 
-#: 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."
@@ -12980,11 +13076,11 @@ msgstr ""
 "Laiško parašas negali būti patikrintas, laiškas galėjo būti pakeistas "
 "persiuntimo metu."
 
-#: 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 "Parašas tvarkingas, negalima patikrinti siuntėjo"
 
-#: 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."
@@ -12992,11 +13088,11 @@ msgstr ""
 "Laiškas pasirašytas su tvarkingu parašu, bet siuntėjas negali būti "
 "patikrintas."
 
-#: 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 "Nekoduotas"
 
-#: 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."
@@ -13004,11 +13100,11 @@ msgstr ""
 "Šis laiškas nėra koduotas. Jo turinys galėjo būti perskaitytas siuntimo "
 "tinkle metu."
 
-#: 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 "Silpnai koduotas"
 
-#: 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 "
@@ -13017,11 +13113,11 @@ msgstr ""
 "Laiškas yra užkoduotas, bet naudoja silpną kriptografinį algoritmą. "
 "Įsilaužėlis gali per pakankamai trumpą laiką atkoduoti laiško turinį."
 
-#: 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 "Koduotas"
 
-#: 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."
@@ -13029,11 +13125,11 @@ msgstr ""
 "Šis laiškas yra užkoduotas. Įsilaužėliui būtų sunku perskaityti laiško "
 "turinį."
 
-#: 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 "Smarkiai užkoduotas"
 
-#: 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 "
@@ -13043,33 +13139,33 @@ msgstr ""
 "Įsilaužėliui yra labai sunku atkoduoti tokį laišką naudojant šiuo metu "
 "prieinamas priemones."
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
 msgstr "_Peržiūrėti Sertifikatą"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio sertifikato"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Praleistos užduotys:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Žiūrėti Kontekste"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Slėpti"
 
@@ -13078,124 +13174,159 @@ msgstr "_Slėpti"
 msgid "Page %d of %d"
 msgstr "Puslapis %d iš %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 "Gaunama „%s“"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota išorinio kūno dalis."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodyklė į FTP svetainę (%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 "Rodyklė į vietinę bylą (%s), galiojanti svetainėje „%s“"
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodyklė į vietinę bylą (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodyklė į nutolusius duomenis (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 msgid "Formatting message"
 msgstr "Laiškas formatuojamas"
 
-#: 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 "Nuo"
 
-#: 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 "Atsakyti-kam"
 
-#: 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 "Kam"
 
-#: 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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Pašto programa"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: 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 priedas"
 
-#: 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 "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
 
-#: 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 "Vidinė klaida: uid yra netinkamame formate: %s"
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Nepalaikomas parašo formatas"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Nežinoma klaida tikrinant parašą"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Nežinoma klaida tikrinant parašą"
 
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Vidinė klaida: uid yra netinkamame formate: %s"
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (vidinis)"
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Kasmet"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Kiekvieną savaitę"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "kiekvieną mėnesį"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13208,22 +13339,22 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: 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 "Nepavyko perkelti pop3 uid podėlių: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Nepavyko perkelti pop3 uid podėlių: %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 "Nepavyko sukurti katalogo „%s“: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nepavyko atverti saugyklos, skirtos „%s“: %s"
@@ -13262,33 +13393,33 @@ msgstr "Įtraukti į Adresų Knygą"
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ši saugykla nepalaiko užsakymų arba jie yra neįjungti."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Užsakytos"
 
-#: 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 "Aplankas"
 
 #. 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 "Prašom pasirinkti serverį."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Kitą kartą neberodyti šios žinutės."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13297,25 +13428,25 @@ msgstr ""
 "Klaida, įkeliant filtro informaciją:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas Laiškas --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "nežinomas siuntėjas"
 
 #. 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 "%Y %m %d %H:%M %%+05d, %%s rašė:"
 
-#: 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"
@@ -13324,7 +13455,7 @@ msgstr ""
 "Negalima saugoti į „%s“\n"
 " %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13333,35 +13464,35 @@ msgstr ""
 "`%s' jau yra.\n"
 "Perrašyti?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 msgid "message"
 msgstr "laiškas"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Klaida: „%s“ egzistuoja, tačiau nėra standartinė byla"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
 msgstr "Išsaugoti Laišką..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 msgid "Add address"
 msgstr "Išsaugoti adresą"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Negalėjau sukurti laikino katalogo: %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 `%"
@@ -13375,7 +13506,7 @@ msgstr ""
 "\n"
 "Ar tikrai ištrinti šiuos laiškus?"
 
-#: 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"
@@ -13447,49 +13578,59 @@ msgid "Default height of the Message Window"
 msgstr "Įprasta laiško tema."
 
 #: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Įprasta laiško tema."
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Įprastas atsakymų stilius"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Įprastas aplankų juostos plotis"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Įprastas aplankų juostos plotis"
 
-#: 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 "Įprastas aplankų juostos plotis"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Rodyti rašymo klaidas laiško kūrimo metu."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Ištuštinti šiukšlių aplankus išeinant"
 
-#: 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 "Išvalyti visus šiukšlių aplankus išeinant iš 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 ""
 "Įjungti žymeklio režimą, kad skaitant laišką būtų galima matyti žymeklį."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Perjungia žymeklio režimą"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Laiškų sąrašo skydelio aukštis"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Laiškų sąrašo skydelio aukštis."
 
-#: 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 "
@@ -13499,15 +13640,19 @@ msgstr ""
 "peržiūrėti gali būti naudojamas įprastas bonobo komponentas, susietas su "
 "atitinkamu tipu tarp GNOME mime tipų bazės."
 
-#: 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 "Žymių ir su jomis susijusių spalvų sąrašas"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
 msgstr "Sąskaitų sąrašas"
 
-#: 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."
@@ -13515,11 +13660,11 @@ msgstr ""
 "Evolution pašto komponentui žinomų sąskaitų sąrašas. Čia išvardinamos sekus "
 "nurodančios katalogus tarp /apps/evolution/accounts registro."
 
-#: 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 "Specialių antraščių sąrašas bei jų įjungimo parametrai."
 
-#: 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."
@@ -13527,15 +13672,15 @@ msgstr ""
 "Evolution pašto komponentui žinomų žymių sąrašas. Sąraše nurodytos vardų ir "
 "spalvų sąsajos, kur spalvos naudoja HTML šešioliktainius kodus."
 
-#: 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 "mime tipų, tikrinamų tarp bonobo komponentų žiūryklių, sąrašas"
 
-#: 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 "Įkelti išorinius paveikslėlius įterptus per http į HTML laiškus"
 
-#: 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 - "
@@ -13545,80 +13690,88 @@ msgstr ""
 "reikšmės yra: 0 - Niekada neįkelti išįrinių paveikslėlių, 1 - Įkelti tik jei "
 "siuntėjas yra tarp adresų knygos, 2 - Visada įkelti išorinius paveikslėlius"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
 msgstr "Registruoti filtro veiksmus"
 
-#: 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 "Registruoti filtrų veiksmus į nurodytą žurnalo bylą."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
 msgstr "Byla registruojanti filtrų veiksmus"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
 msgstr "Byla registruojanti filtrų veiksmus."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr "Pažymėti kaip perskaityta po nurodyto laiko tarpo"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr "Pažymėti kaip Perskaityta po nurodyto laiko tarpo."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr "Pažymėti citatas tarp laiško „Peržiūros“"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Pažymėti citatas tarp laiško „Peržiūros“."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Laiško rodymo stilius (normalus, pilnos antraštės, pradinis tekstas)"
 
-#: 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 "Naujo Pašto Perspėjimų garso byla"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
 msgstr "Perspėjimų apie Naują Paštą tipas"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr "Užklausti, kai tema nenurodyta"
 
-#: 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 "Užklausti patvirtinimo, kai bandoma išvalyti aplanką."
 
-#: 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 "Užklausti patvirtinimo, kai bandoma siųsti laišką nenurodžius temos."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr "Įspėti vartotoją išvalymo metu"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr "Užklausti patvirtinimo, kai užpildomi tik bcc gavėjų laukai"
 
-#: 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."
@@ -13626,94 +13779,106 @@ msgstr ""
 "Paklausti, kai siunčiamas HTML laiškas adresatams, kurie gali nenorėti gauti "
 "HTML formato laiškų."
 
-#: 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 "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais."
 
-#: 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 ""
 "Užklausti patvirtinimo, kai bandoma siųsti HTML laišką to nenorintiems "
 "adresatams"
 
-#: 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 "Atpažinti nuorodas tekste ir jas pakeisti."
 
-#: 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 "Atpažinti šypsiukus tekste ir juos pakeisti paveikslėliais."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr "Tikrinti ateinantį paštą dėl galimų šiukšlių"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr "S14pt4 nu0st4t4"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr "S14pt4 nu0st4t4."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Paprastai siųsti laiškus HTML formatu"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "Paprastai siųsti laiškus HTML formatu."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "Įjungti Animacijas"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "Leisti judėti prikabintiems animuotiems paveikslėliams."
 
-#: 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 "Rodyti ištrintus laiškus (su perbraukimu) tarp laiškų sąrašo."
 
-#: 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 "Rodyti ištrintus laiškus laiškų sąraše"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "Naudoti „Peržiūros“ skyrių"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "Naudoti „Peržiūros“ skyrių."
 
-#: 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 "Groti garsus, kai pasirodo nauji laiškai."
 
-#: 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 ""
 "Nurodo, kokį perspėjimo apie naujus laiškus tipą vartotojas norėtų naudoti."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "Rašybą tikrinti rašymo metu"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "Terminalo šriftas"
 
-#: 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 "Pašto išvedime naudojamas terminalo šriftas"
 
-#: 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 "Pašto išvedime naudojamas kintamo pločio šriftas"
 
-#: 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;"
@@ -13724,99 +13889,99 @@ msgstr ""
 "išvedimo principus. XML struktūros formatas yra &lt;antraštė enabled&gt; - "
 "nustatykite enabled, jei antraštė turi būti išvedama peržiūrint laišką."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "Gijomis suskirstytas laiškų sąrašas."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "Gijomis suskirstytas laiškų sąrašas"
 
-#: 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 "Kurti laiškų sąrašo gijas remiantis laiškų temomis"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "Įprastos sąskaitos UID seka."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr "Naudoti Spamassasin demoną ir klientą"
 
-#: 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 "Naudoti Spamassassin demoną ir klientą (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "Naudoti savo šriftus"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "Naudoti specialius šriftus rodant laiškus"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "Kintamo pločio šriftas"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr "Rodyti/Bcc punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr "Rodyti/Bcc meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr "Rodyti/Cc meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr "Rodyti/Cc meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr "Rodyti/Nuo meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr "Rodyti/Nuo meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr "Rodyti/SkirtasKam meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr "Rodyti/SkirtasKam meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr "Rodyti/AtsakytiKam meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr "Rodyti/AtsakytiKam meniu punktas yra įjungtas."
 
-#: 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."
@@ -13824,11 +13989,11 @@ msgstr ""
 "Ar naudoti gijų rūšiavimą pagal antraštes, jei laiškai neturi In-Reply-To "
 "arba Reference antraščių."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Importuoti"
@@ -13868,14 +14033,14 @@ msgstr "Evolution importuoja tavo seną Elm paštą"
 #: 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 "Importuojama..."
 
 #: 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 "Prašome palaukti"
 
@@ -13924,12 +14089,12 @@ msgstr "Importuojamos bylos"
 msgid "Scanning %s"
 msgstr "Skanuojama %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetų  Filtras „%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"
@@ -13955,7 +14120,7 @@ msgstr ""
 "dirba\n"
 "taip, kaip numatyta."
 
-#: 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"
@@ -13967,7 +14132,7 @@ msgstr ""
 "kurios yra nepalaikomos Evolution.\n"
 "Šie filtrai nebus įkelti."
 
-#: 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"
@@ -13980,24 +14145,24 @@ msgstr ""
 "bus pakeisti taip, kad tikrintų ar pateikta simbolių seka yra\n"
 "tarp laiško."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Pašto Filtrai"
 
-#: 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?"
@@ -14030,62 +14195,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Esamas saugyklos formatas:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Perskaičiuoti laiško turinį"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Naujas saugyklos formatas:"
-
-#: 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 ""
-"Pastaba: Konvertuojant tarp pašto dėžutės formatų, nesėkmė\n"
-"(tokia kaip vietos diske trūkumas) negali būti savaime\n"
-"atstatoma. Naudok šią priemonę atsargiai."
-
-#: 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 "Tu neįvedei visos būtinos informacijos."
 
 #. 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 sąskaitų tvarkyklė"
 
-#: 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 "_Hostas:"
 
-#: 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 "Vartotojo _vardas:"
 
-#: 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 "_Kelias:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviejų aplankų tuo pačiu vardu."
 
@@ -14118,11 +14249,11 @@ msgstr "Atsakymai į %s"
 msgid "Add Filter Rule"
 msgstr "Pridėti filtro taisyklę"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Šios filtrų taisyklė(s):\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14133,46 +14264,46 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Naujas pašto laiškas"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Pašto laiškas"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Rašyti naują laišką"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Naujas vAplankas"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pašto Filtrai"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sukurti naują kalendorių"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Asmenybė"
 
-#: 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 "
@@ -14182,11 +14313,12 @@ msgstr ""
 "laukai žemiau gali likti tušti, nebent norėtumėte įtraukti šią informaciją "
 "Jūsų siunčiamame pašte."
 
-#: 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 "Pašto gavimas"
 
-#: 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."
@@ -14195,15 +14327,15 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Prašom pasirinkti iš žemiau esančių parinkčių"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Pašto siuntimas"
 
-#: 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."
@@ -14212,11 +14344,11 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: 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 "Sąskaitos tvarkymas"
 
-#: 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 "
@@ -14229,123 +14361,256 @@ msgstr ""
 "sąskaitą. Prašome įvesti šios sąskaitos pavadinimą žemiau esančiame "
 "laukelyje. Šis pavadinimas bus naudojamas tik vaizdavimui."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: 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 "Jungiamasi prie serverio..."
 
-#: 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 " _Patikrinti, kokie tipai palaikomi"
 
+#: mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>Peržiūra</b>"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL yra nepalaikomas šiame Evolution variante)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL yra nepalaikomas šiame Evolution variante)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Būklė:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Būklė:</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>Išve_damos Pašto Antraštės</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 "Siunči_ant koduotus laiškus koduoti juos ir sau"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Sąskaitų Tvarkyklė"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Sąskaitos informacija"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Tikrinama, ar yra naujų laiškų"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "P_ridėti Scenarijų"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Pridėti naują parašą..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "_Visada koduoti laiškus sau, kai jie yra siunčiami koduoti"
+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>Išve_damos Pašto Antraštės</b>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Visada siųsti slaptą kopiją (_Bcc) adresu:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Visada siųsti kopija (_Cc) adresu:"
+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
+#, fuzzy
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<b>Rodomas Pranešimas</b>"
+
+#: 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 "Naujų Laiškų Perspėjimai"
+
+#: 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 "Išsiųsti laiškai ir juodraščiai"
+
+#: 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 "Siunči_ant koduotus laiškus koduoti juos ir sau"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Sąskaitų Tvarkyklė"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Pridėti naują parašą..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "P_ridėti Scenarijų"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "_Visada koduoti laiškus sau, kai jie yra siunčiami koduoti"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Visada siųsti kopija (_Cc) adresu:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Visada siųsti slaptą kopiją (_Bcc) adresu:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Visad_a pasirašyti siunčiamus laiškus, kai naudojama ši sąskaita"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Visada koduojant pasi_tikėti raktais tarp turimo raktų rinkinio"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Pridėti originalų laišką"
 
-#: 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 "Priedas"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autentikacija"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Automatiškai įterpti šypsiukų paveikslėlius"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "Automatiškai tikrinti paštą kas"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Įspėti gavus naują laišką"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "_Koduotė:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "Spalv_os"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Pat_ikrinti Gautą Paštą"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "_Tikrinti žinučių rašybą rašymo metu"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Tikrinama, ar yra naujų laiškų"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Tikrinti gaunamus laiškus dėl galimų šiukšlių"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "_Klaidingų žodžių spalva:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Laiškų Kūrimas"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "Spalv_os"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Konfigūravimas"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Patvirtinti kai išvalomas aplankas"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14360,273 +14625,261 @@ msgstr ""
 "\n"
 "Paspauskite „Baigti“, kad išsaugotumėte Jūsų nustatymus."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Įprasta Elgsena"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Įprasta simbolių _koduotė:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Laiškų Trynimas"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Vi_sada skaitmeniniu būdu pasirašyti siunčiamus laiškus"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "_Įprastos reikšmės"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Necituoti pradinio laiško"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Nepasirašyti susitiki_mų užklausimų (dėl suderinamumo su Outlook)"
 
-#: 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 "Baigta"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "Juodraščių _aplankas:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Pašto Sąskaitos"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "El. pašto _adresas:"
 
-#: 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 "Iš_tuštinti šiukšlių aplankus išeinant"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Kodavimo sertifikatas:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution sąskaitų padėjėjas"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Paleisti Komandą..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Fi_ksuotas-plotis:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Filtrų Nuostatos"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Šrifto Savybės"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Rašyti laišką _HTML formatu"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML Paštas"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "_Antraštės"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Paryškinti _citatas su "
 
-#: 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 "Viduje"
 
-#: 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 "Žymės ir Spalvos"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Paveikslėlių Įkėlimas"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Pašto nustatymas"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Pašto dėžutės vieta"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Laiškų Rašymas"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Laiškų Peržiūra"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Naudojami Šriftai"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Naujų Laiškų Perspėjimai"
-
-#: 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"
 msgstr "Pastaba: Jungiantis pirmą kartą Jus paprašys įvesti slaptažodį"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Nebūtina informacija"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG Ra_kto ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Pasirink spalvą"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Groti garsus, kai pasirodo nauji laiškai"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais"
 
-#: 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 "Spausdinami Šriftai"
-
-#: 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 "Cituoti originalų laišką"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Prisi_minti šį slaptažodį"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Prisiminti šį slaptažodį"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "A_tsakyti-Kam:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Pašto gavimas"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Gavimo Nu_ostatos"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "_Prisiminti šį slaptažodį"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Būtina informacija"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Atstatyti Įprastą"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Prisiminti šį slaptažodį"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "S_augumas"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "Įpra_stas Šriftas"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Saugus MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Saugumas"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Pasirinkti HTML fiksuoto pločio šriftą"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Pasirinkti HTML fiksuoti pločio šriftą naudojamą spausdinant"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Pasirinkti HTML kintamo pločio šriftą"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Pasirinkti HTML kintamo pločio šriftą spausdinimui"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Pa_srinkite..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Pašto siuntimas"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Išsiųstų _laiškų aplankas:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Išsiųsti laiškai ir juodraščiai"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Serverio nustatymas"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "Parašo sertifikatas:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Parašas:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Parašai"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Nurodyti _bylą:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "Rašybos _Tikrinimas"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Standartinė Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Terminalo Šriftas"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Tipas:"
+
+#: 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"
@@ -14636,7 +14889,7 @@ msgstr ""
 "parašas. Nurodytas vardas bus naudojamas tik atvaizdavimo\n"
 "tikslais. "
 
-#: 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 "
@@ -14645,7 +14898,7 @@ msgstr ""
 "Šis puslapis leidžia Jums nustatyti rašybos tikrinimo elgseną ir kalbą. "
 "Pateiktas kalbų sąrašas galioja tik toms kalboms, kurių žodynai yra įdiegti."
 
-#: 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\""
@@ -14653,15 +14906,15 @@ msgstr ""
 "Pasirinkite pavadinimą, kuriuo norėtumėte vadinti šią sąskaitą.\n"
 "Pavyzdžiui, „Darbas“ ar „Asmeninė“."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Naudoti _Tarnybą"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Kint_amas-plotis:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14671,178 +14924,111 @@ msgstr ""
 "\n"
 "Spausk „Tolyn“, kad pradėtumėte. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Pridėti Parašą"
 
-#: 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 "Vis_ada įkelti paveikslėlius iš tinklo"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Visad_a pasirašyti siunčiamus laiškus, kai naudojama ši sąskaita"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Autentikacijos tipas: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Autentifikacijos tipas: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Automatiškai tikrinti paštą kas"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Automatiškai įterpti šypsiukų paveikslėlius"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Įspėti gavus naują laišką"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "Patvirtinti kai išvalomas aplankas"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "Įprastas _parašas:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Įprastos reikšmės"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Vi_sada skaitmeniniu būdu pasirašyti siunčiamus laiškus"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neinformuoti apie naujų laiškų atsiradimą"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Įjungti"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Visada koduoti išsiunčiamus laiškus"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "Pe_rsiuntimo stilius:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Pilnas vardas:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML Paštas"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Asmenybė"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Šiukšlės"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "Įke_lti paveikslėlius, jei siuntėjas yra adresų knygoje"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "_Tik Vietiniai Testai"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Padaryti šią sąskaitą įprastine"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "Pažy_mėti laiškus skaitytais po"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: 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 "_Niekada neįkelti paveikslėlių iš tinklo"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Groti garsus, kai pasirodo nauji laiškai"
-
-#: 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 ""
 "_Paklausti, kai siunčiamas HTML laiškas adresatams, kurie nenori gauti HTML "
 "laiškų"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prieš siunčiant laiškus nenurodžius _temos"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Pašto Gavimas"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Atsakymų stilius:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "Atstatyti įp_rastas reikšmes"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Scenarijus:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "Pa_srinkite..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Siunčiamas Paštas"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Rodyti judančius paveik_slėlius"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Parašai"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "Įpra_stas Šriftas"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminalo Šriftas"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "Na_udoti saugią jungtį (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Na_udoti sisteminius šriftų nustatymus"
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minutę(es)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "spalva"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "aprašymas"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Tikrinamas %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14851,7 +15037,7 @@ msgstr ""
 "Klaida „%s“ metu:\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14860,7 +15046,7 @@ msgstr ""
 "Klaida vykdant veiksmą:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Dirbama"
 
@@ -14868,16 +15054,16 @@ msgstr "Dirbama"
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko pritaikyti išeinančių filtrų: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14886,116 +15072,117 @@ msgstr ""
 "Nepavyko įterpti į %s: %s\n"
 "Įterpiama į vietinį „Išsiųstų laiškų“ aplanką."
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepavyko įrašyti laiško į „Išsiųstų“ aplanką: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Siunčiamas „%s“"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siunčiamas laiškas %d iš %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
 msgstr "Nesėkmė ties laišku %d iš %d"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Laiškas išsaugomas į aplanką"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys „%s“"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Išvalomas aplankas"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Išvaloma šiukšlinė tarp „%s“"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Vietiniai Aplankai"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiškas %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Gaunami %d laiškai"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Gaunami %d laiškai"
+msgstr[1] "Gaunami %d laiškai"
+msgstr[2] "Gaunami %d laiškai"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Išsaugomi %d laiškai"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Išsaugomi %d laiškai"
+msgstr[1] "Išsaugomi %d laiškai"
+msgstr[2] "Išsaugomi %d laiškai"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15004,7 +15191,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15013,11 +15200,11 @@ msgstr ""
 "Klaida išsaugant laiškus į: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15026,25 +15213,21 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr "Keičiama šiukšlių žymė"
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skirti raidžių dydį"
@@ -15057,84 +15240,80 @@ msgstr "Ieškoti laiške"
 msgid "Find:"
 msgstr "Rasti:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Paieška"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Skaitmeninis Parašas"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Kriptografija"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
 msgstr "Saugumo Informacija"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kelias: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Siunčiamas ir gaunamas paštas"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
 msgstr "_Atšaukti Visus?"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: 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 "Laukiama..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Vartotojas nutraukė veiksmą."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įvesk %s slaptažodį"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Įvesk slaptažodį"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Prisiminti šį slaptažodį"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "P_risiminti šį slaptažodį iki šios sesijos galo"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nepavyko išsaugoti parašo bylos: %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"
@@ -15144,23 +15323,23 @@ msgstr ""
 "\n"
 "Ar norėtum išsaugoti pakeitimus?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr "A_tsisakyti pakeitimų"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Išsaugoti parašą"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Keisti parašą"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Įveskite šio parašo vardą."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -15190,17 +15369,17 @@ msgstr "Persiųstas laiškas"
 msgid "Invalid folder: `%s'"
 msgstr "Netinkamas aplankas: „%s“"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Tvarkomas virtualus aplankas: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15213,84 +15392,84 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Keisti vAplanką"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojantį vAplanką '%s'."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Aukščiausias"
 
-#: 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 "Šiandien %H:%M"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -15338,7 +15517,7 @@ msgstr "Tęsinys"
 msgid "For Your Information"
 msgstr "Jūsų Žiniai"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Persiųsti"
 
@@ -15346,11 +15525,11 @@ msgstr "Persiųsti"
 msgid "No Response Necessary"
 msgstr "Atsakymas Nebūtinas"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Atsakyti visiems"
 
@@ -15375,7 +15554,8 @@ msgstr ""
 "Pasirinkite tęsiniams galiojančius veiksmus iš „Žymių“ meniu."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Baigiasi:"
 
 #: mail/message-tags.glade.h:7
@@ -15584,7 +15764,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Atšaukti šio punkto susitikimą"
 
-#: 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 "Pasirinkite informaciją, kurią norėtumėte importuoti:"
 
@@ -15613,26 +15793,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Pasirink importavimo komponentą"
 
-#: 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 "Nėra tokios bylos %s"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importuojama"
 
-#: 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 "Klaida įkeliant %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15641,31 +15821,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automatiškas"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
 msgstr "_Bylos vardas:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Pasirink bylą"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
 msgstr "Bylos _tipas:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
 msgstr "Importuoti duomenis ir nuostatas iš senesnių programų"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
 msgstr "Įkelti _vieną bylą"
 
-#: 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"
@@ -15673,26 +15853,26 @@ msgstr ""
 "Prašome palaukti...\n"
 "Ieškoma esamų nustatymų"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Paleidžiami inteligentiški importeriai"
 
-#: 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 "Nuo %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Protokolui „%s“ nėra tiekėjo."
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Nepavyko paleisti gpg programos."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
 msgstr "_Importuoti"
 
@@ -15700,7 +15880,7 @@ msgstr "_Importuoti"
 msgid "Closing connections..."
 msgstr "Uždaromos jungtys..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution Nustatymai"
 
@@ -15734,11 +15914,11 @@ msgstr "Nepavyko atverti bendrinio aplanko: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nepavyko rasti nurodyti bendrinio aplanko."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Pradedama importuoti"
 
-#: 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 "
@@ -15752,10 +15932,6 @@ msgstr ""
 "\n"
 "Ar Jūs norite nutraukti Pagalbininko darbą dabar?"
 
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "Uždaryti Pagalbininką"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nenurodytas aplanko vardas."
@@ -15797,15 +15973,15 @@ msgstr "Bug buddy negalėjo būti paleistas."
 msgid "About Ximian Evolution"
 msgstr "Apie Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -15859,7 +16035,6 @@ msgstr "Pasirinkimo laukas"
 
 #: 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 "Nauja"
 
@@ -15913,16 +16088,17 @@ msgid "Create a new test item"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
 msgstr "Esamos Jungtys"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Paspausk Gerai, kad uždarytum šias jungtis ir atsijungtum"
+msgid "Active Connections"
+msgstr "Esamos Jungtys"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Žemiau nurodytos jungtys šiuo metu yra aktyvios:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Paspausk Gerai, kad uždarytum šias jungtis ir atsijungtum"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -16044,28 +16220,28 @@ msgstr ""
 "Sveiki atvykę į Evolution importavimo priemonę.\n"
 "Šis meistras padės Jums įkelti išorines bylas į Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importeriai"
 
-#: 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 "Importuoti"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Neimportuoti"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Kitą kartą nebeklausti"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis iš žemiau nurodytų bylų:"
 
 #. 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"
@@ -16101,7 +16277,7 @@ msgstr ""
 "Mes tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir\n"
 "laukiame Jūsų prisidėjimo prie šio produkto tobulinimo!\n"
 
-#: shell/main.c:241
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -16109,48 +16285,48 @@ msgstr ""
 "Ačiū\n"
 "Ximian Evolution komanda\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Kitą kartą nebeklausti"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negalėjau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negalėjau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution paleidimas aktyvuoja nurodytą komponentą"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Paleisti neprisijungiant"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Paleisti prisijungiant"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr "Priverstinai uždaryti visus Evolution komponentus"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į bylą."
 
-#: 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"
@@ -16159,43 +16335,54 @@ msgstr ""
 "%s: --online ir --offline negali būti naudojami tuo pačiu metu.\n"
 "  Naudokite %s --help norėdami gauti daugiau informacijos.\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 "Pasirinkti įkeliamą sertifikatą..."
 
-#: 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 "Sertifikato Vardas"
 
-#: 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 "Paskirtis"
 
-#: 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 "Serijinis Numeris"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Galiojimo pabaiga"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatų žiūryklė: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Įveskite „%s“ slaptažodį"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Įveskite „%s“ slaptažodį"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Įveskite slaptažodį"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16385,7 +16572,8 @@ msgstr "Jūsų sertifikatų byla saugo šių asmenų sertifikatus:"
 msgid "Your Certificates"
 msgstr "Jūsų Sertifikatai"
 
-#: 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 "Toks sertifikatas jau yra"
 
@@ -16656,7 +16844,7 @@ msgstr "Perkelti Kontaktą(us) į Kitą Aplanką..."
 msgid "Move to Folder..."
 msgstr "Perkelti į aplanką..."
 
-#: 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 "Įdėti iš krepšio"
 
@@ -16665,8 +16853,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Peržiūrėti kontaktus prieš spausdinant"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Spa_udinio peržiūra"
 
@@ -16714,13 +16902,13 @@ msgstr "Sustabdyti įkėlimą"
 msgid "View the current contact"
 msgstr "Rodyti esamą kontaktą"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Veiksmai"
 
@@ -16741,14 +16929,10 @@ msgid "_Save as VCard"
 msgstr "Iš_saugoti kaip VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Ieškoti kontaktų"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Pažymėti _viską"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Siųsti laišką kontaktui..."
 
@@ -16756,58 +16940,54 @@ msgstr "_Siųsti laišką kontaktui..."
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Ištrinti visus pasitaikymus"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Ištrinti įvykį"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Ištrinti šį pasitaikymą"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Ištrinti šį pasitaikymą"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Eiti į"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Eiti atgal"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Eiti pirmyn"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Eiti į _datą"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Eiti į nurodytą datą"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Eiti į šiandieną"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Sąrašas"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mėnesis"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Kitas"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Peržiūrėti kalendorių prieš spausdinant"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Praeitas"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Spausdinti šį kalendorių"
@@ -16816,7 +16996,7 @@ msgstr "Spausdinti šį kalendorių"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Skelbti Laisvumo/Užimtumo informaciją šiam kalendoriui"
 
-#: 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 "_Išvalyti"
 
@@ -16825,34 +17005,54 @@ msgid "Purge old appointments and meetings"
 msgstr "Pašalinti visus paskyrimus ir susitikimus"
 
 #: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Pasirink vardus"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Eiti į nurodytą datą"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Pasirink aplanką"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Rodyti sąrašą"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Rodyti vieną dieną"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Rodyti vieną mėnesį"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Rodyti vieną savaitę"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Rodyti darbo savaitę"
 
-#: 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 "Dabar"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Peržiūrėti esamą paskyrimą"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Savaitė"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Atidaryti Paskyrimą"
 
@@ -17117,7 +17317,7 @@ msgstr "Pažymėti _visus skaitytais"
 msgid "Mark all visible messages as read"
 msgstr "Visus matomus laiškus pažymėti perskaitytais"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Įterpti laišką(us) iš atmintinės"
 
@@ -17284,306 +17484,308 @@ msgid "F_orward As..."
 msgstr "Persiųsti Kaip..."
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Filtravimo taisyklės"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtras pagal _Konferenciją..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtras pagal Siu_ntėją..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtras pagal _Gavėjus..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtras pagal _Temą..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Pažymėti pasirinktą laišką(us) kaip šiukšlę"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Pažymėti pasirinktą laišką(us) kaip tęsinį"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_Tęsinys..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Priverstinai įkelti HTML laiškuose esančius paveiksliukus"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Persiųsti pasirinktą laišką naujo laiško tekste"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Persiųsti pasirinktą laišką cituojamą kaip atsakymas"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Persiųsti pasirinktą laišką kažkam"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Persiųsti pasirinktą laišką prisegtą kaip priedas"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Padidinti teksto dydį"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Įkelt_i paveikslėlius"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Padaryti _svarbiu"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Pažymėti _neskaitytu"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Padaryti n_esvarbiu"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Pasirinktą laišką(us) pažymėti lyg jis(ie) buvo perskaitytas"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Pažymėti pasirinktą laišką(us) kaip svarbų"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Pažymėti pasirinktą laišką(us) kaip šiukšlę"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Atšaukti pažymėto laiško(ų) žymėjimą šiukšlėmis"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Pažymėti pasirinktą laišką(us) kaip neperskaityta"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Pažymėti pasirinktą laišką(us) kaip nesvarbų"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Pasirinktus laiškus pažymėti ištrynimui"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Perkelti"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Perkelti pažymėtą laišką(us) į kitą aplanką"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Kitas"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "K_itas Svarbus Laiškas"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Kita _Gija"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Kitas _Neskaitytas Laiškas"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Ne Šiukšlė"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Atidaryti pasirinktą laišką naujame lange"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Atidaryti pasirinktą laišką rašyklės lange siuntimui iš naujo"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Originalus _dydis"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "_Ankstesnis Neskaitytas Laiškas"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Rašyti Atsak_ymą"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Patalpinti atsakymą į laišką tarp Viešo aplanko"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Ankst_esnis Svarbus Laiškas"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Peržiūrėti laišką prieš spausdinant"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Praeitas"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Spausdinti šį laišką"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Nu_kreipti"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Nukreipti (permesti) pasirinktą laišką kam nors kitam"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Atstatyti teksto originalų dydį"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "I_eškoti Laiške..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Mažesnis"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Išsaugoti laišką į tekstinę bylą"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Ieškoti eilutės rodomo laiško tekste"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Nustatyti puslapio parinktis Jūsų esamam spausdintuvui"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "_Rodyti laiško šaltinį"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Rodyti pilnas _antraštes"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Rodyti mirksintį žymeklį išvedamų laiškų tekste"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Rodyti laišką normaliu stiliumi"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Rodyti laišką su visomis pašto antraštėmis"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Rodyti neapdorotą laiško šaltinį"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Teksto _dydis"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Sugrąžinti pažymėtus laiškus"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "vAplankas pagal _Konferenciją..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "vAplankas pagal Siu_ntėją..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "vAplankas pagal _Gavėjus..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "vAplankas pagal _Temą..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "Prik_abinta"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti į aplanką"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtrą iš laiško"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Eiti į"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Kontekste"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Didesnis"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Laiško rodymas"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Perkelti į aplanką"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Kitas Laiškas"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Normalus rodymas"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Atidaryti laišką"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Ankstesnis Laiškas"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Cituojant"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "Da_r kartą siųsti..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Įran_kiai"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "S_ugrąžinti"
 
@@ -17849,39 +18051,39 @@ msgstr "Kopijuoti pasirinktą užduotį"
 msgid "Cut selected task"
 msgstr "Iškirpti pasirinktą užduotį"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Ištrinti baigtas užduotis"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Ištrinti pažymėtas užduotis"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Pažymėti _kaip Užbaigtą"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Pažymėti pasirinktas užduotis kaip užbaigtas"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Įdėti užduotį iš krepšio"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Parodo spausdinamų užduočių sąrašą"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Spausdinti užduočių sąrašą"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Peržiūrėti pasirinktą užduotį"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Atidaryti Užduotį"
 
@@ -18011,10 +18213,15 @@ msgid "_Day View"
 msgstr "_Dienos vaizdas"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Sąrašo vaizdas"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Mėnesio vaizdas"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Darbo Savaitės vaizdas"
 
@@ -18043,10 +18250,16 @@ msgid "_Messages"
 msgstr "_Laiškai"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Su _Kategorija"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Kada reikia:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Priskirti būseną"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Užduotys"
 
@@ -18105,14 +18318,10 @@ msgstr "PATKPŠS"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: 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 "Dabar"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Dabar"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18122,82 +18331,87 @@ msgstr "Data turi būti įvesta formatu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentinė reikšmė turi būti tarp 0 ir 100 imtinai"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltų"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Centrinės Europos"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Kinų"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kirilica"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Graikų"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Žydų"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japonų"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Korėjiečių"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turkų"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Unikodas"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Vakarų Europos"
 
-#: 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 "Vakarų Europos"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradicinis"
 
-#: 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 "Supaprastintas"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukrainiečių"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "vaizdinis"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nežinoma koduotė: %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 "Koduotė"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Įvesk, kokią koduotę naudoti"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Kita..."
 
@@ -18260,11 +18474,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Ieškoti"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Paieškos redaktorius"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Išsaugoti paiešką"
 
@@ -18285,15 +18504,15 @@ msgstr "Išs_amus..."
 msgid "Choose Image"
 msgstr "Pasirinkite bylą"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Ieškoti"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Surasti"
 
-#: 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 "Iš_valyti"
 
@@ -18323,6 +18542,333 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% užbaigta)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Adresų Knygos Šaltiniai..."
+
+#~ msgid "Selected:"
+#~ msgstr "Pasirinkta:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 kontaktas"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "ir %d kitus kontaktus."
+
+#~ msgid "Send an Email"
+#~ msgstr "Siųsti el. Laišką"
+
+#~ msgid "1 day"
+#~ msgstr "1 diena"
+
+#~ msgid "1 week"
+#~ msgstr "1 savaitė"
+
+#~ msgid "1 hour"
+#~ msgstr "1 valanda"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minutė"
+
+#~ msgid "1 second"
+#~ msgstr "1 sekundė"
+
+#~ msgid "Description"
+#~ msgstr "Aprašymas"
+
+#~ msgid "component"
+#~ msgstr "komponentas"
+
+#~ msgid "Alarms"
+#~ msgstr "Perspėjimai"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Geografinė vietovė"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Kas %d dienų"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Kas %d savaičių"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Kiekvienos %d savaitės dieną"
+
+#~ msgid "every %d months"
+#~ msgstr "kas %d mėnesių"
+
+#~ msgid "Every %d years"
+#~ msgstr "Kas %d metų"
+
+#~ msgid "Go To Date"
+#~ msgstr "Eiti į datą"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Eiti į šiandieną"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP Serveriai"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_Paieškos sritis:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "Baigėsi STARTTLS užklausos laiko riba: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "STARTTLS atsakymo klaida"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "Baigėsi HELO užklausos laiko riba: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "HELO atsakymo klaida"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "Baigėsi AUTH užklausos laiko riba: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH užklausa nepavyko."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM atsakymo klaida"
+
+#~ msgid "DATA response error"
+#~ msgstr "DATA atsakymo klaida"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "Baigėsi DATA siuntimo laiko riba: laiško nutraukimas: %s: paštas "
+#~ "neišsiųstas"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA pabaigos patvirtinimo klaida"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "Baigėsi RSET užklausos laiko riba: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "RSET atsakymo klaida"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "Baigėsi QUIT užklausos laiko riba: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "QUIT atsakymo klaida"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "prieš %d sekundžių"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "prieš %d minučių"
+
+#~ msgid "%d hours ago"
+#~ msgstr "prieš %d valandų"
+
+#~ msgid "%d days ago"
+#~ msgstr "prieš %d dienų"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "prieš %d savaičių"
+
+#~ msgid "%d months ago"
+#~ msgstr "prieš %d mėnesių"
+
+#~ msgid "%d years ago"
+#~ msgstr "prieš %d metų"
+
+#~ msgid "Then"
+#~ msgstr "Tada"
+
+#~ msgid "If"
+#~ msgstr "Jeigu"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Keisti filtrus"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Keisti vAplankus"
+
+#~ msgid "Outgoing"
+#~ msgstr "Siunčiamas"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Nusiųsti Laišką Aplinkos Komandai"
+
+#~ msgid "Shell Command"
+#~ msgstr "Aplinkos komanda"
+
+#~ msgid "Rules"
+#~ msgstr "Taisyklės"
+
+#~ msgid "[script]"
+#~ msgstr "[scenarijus]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Pridėti parašo scenarijų"
+
+#~ msgid "Current store format:"
+#~ msgstr "Esamas saugyklos formatas:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Perskaičiuoti laiško turinį"
+
+#~ msgid "New store format:"
+#~ msgstr "Naujas saugyklos formatas:"
+
+#~ 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 ""
+#~ "Pastaba: Konvertuojant tarp pašto dėžutės formatų, nesėkmė\n"
+#~ "(tokia kaip vietos diske trūkumas) negali būti savaime\n"
+#~ "atstatoma. Naudok šią priemonę atsargiai."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL yra nepalaikomas šiame Evolution variante)"
+
+#~ msgid "Account Information"
+#~ msgstr "Sąskaitos informacija"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentikacija"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Laiškų Kūrimas"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigūravimas"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Įprasta Elgsena"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Laiškų Trynimas"
+
+#~ msgid "Filter Options"
+#~ msgstr "Filtrų Nuostatos"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Žymės ir Spalvos"
+
+#~ msgid "Loading Images"
+#~ msgstr "Paveikslėlių Įkėlimas"
+
+#~ msgid "Message Display"
+#~ msgstr "Laiškų Peržiūra"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Naudojami Šriftai"
+
+#~ msgid "Optional Information"
+#~ msgstr "Nebūtina informacija"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Spausdinami Šriftai"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Prisi_minti šį slaptažodį"
+
+#~ msgid "Remember this _password"
+#~ msgstr "_Prisiminti šį slaptažodį"
+
+#~ msgid "Required Information"
+#~ msgstr "Būtina informacija"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Atstatyti Įprastą"
+
+#~ msgid "S_ecurity"
+#~ msgstr "S_augumas"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Saugus MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Serverio nustatymas"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Autentikacijos tipas: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Autentifikacijos tipas: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "Įprastas _parašas:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Pilnas vardas:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Asmenybė"
+
+#~ msgid "_Junk"
+#~ msgstr "_Šiukšlės"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Pašto Gavimas"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "Atstatyti įp_rastas reikšmes"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Siunčiamas Paštas"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Siunčiamas „%s“"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Nesėkmė ties laišku %d iš %d"
+
+#~ msgid "Changing junk status"
+#~ msgstr "Keičiama šiukšlių žymė"
+
+#~ msgid "Search"
+#~ msgstr "Paieška"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Skaitmeninis Parašas"
+
+#~ msgid "Encryption"
+#~ msgstr "Kriptografija"
+
+#~ msgid "Quit Assistant"
+#~ msgstr "Uždaryti Pagalbininką"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Žemiau nurodytos jungtys šiuo metu yra aktyvios:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Ieškoti kontaktų"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Eiti į _datą"
+
+#~ msgid "Go to today"
+#~ msgstr "Eiti į šiandieną"
+
+#~ msgid "With _Category"
+#~ msgstr "Su _Kategorija"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Adresų knygelės šaltinis"
 
@@ -18369,9 +18915,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Scanning directory"
 #~ msgstr "Skanuojamas katalogas"
 
-#~ msgid "    "
-#~ msgstr "    "
-
 #~ msgid "Cannot copy folder: %s"
 #~ msgstr "Nepavyko nukopijuoti aplanko: %s"
 
@@ -18670,9 +19213,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "<b>Aliarmo Garsas</b>"
 
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "<b>Rodomas Pranešimas</b>"
-
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Pagrindai</b>"
 
@@ -18685,9 +19225,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "<b>Task List</b>"
 #~ msgstr "<b>Užduočių Sąrašas</b>"
 
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Laikas</b>"
-
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "<b>Darbo Savaitė</b>"
 
@@ -18706,9 +19243,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Sa_ntrauka</b>"
 
-#~ msgid "<b>Preview</b>"
-#~ msgstr "<b>Peržiūra</b>"
-
 #~ msgid "<b>Progress</b>"
 #~ msgstr "<b>Pažanga</b>"
 
@@ -18718,9 +19252,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Test type"
 #~ msgstr "Testo tipas"
 
-#~ msgid "Select Names"
-#~ msgstr "Pasirink vardus"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Pasirinkti Kontaktai:"
 
diff --git a/po/lv.po b/po/lv.po
index 0fe2000613..b618376a28 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution for latvian\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2003-02-03 23:02+0200\n"
 "Last-Translator: Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -14,6 +14,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\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 "Rediģēt adrešu grāmatau"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Saglabāt kā"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Uzdevumi "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "kartes"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 karte"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakti:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _logs"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Noklusētā sinhr. adrese:"
@@ -103,78 +145,94 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adrešu grāmata"
 
-#: 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 "Dzēst"
 
-#: 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 "Rekvizīti..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 #, fuzzy
 msgid "New Contact"
 msgstr "Jauns kontakts:"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Izveidot jaunu kontaktu"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Jauns kontaktu saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktu saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Izveidot jaunu kontaktu sarakstu"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Adrešu grāmata"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Adrešu grāmata"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Ievietot jaunu uzdevumu"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "Nespēju savienoties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nespēju autentificēties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr "Nevarēju izpildīt pieprasījumu uz saknes 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 "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr "Kļūda saņemot shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
 
@@ -200,17 +258,17 @@ msgstr "Ehotestējam %s"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personīgi"
 
@@ -266,7 +324,7 @@ msgstr "Šīs adrešu grāmatas aizmugure negribēja izpildīt pieprasījumu."
 msgid "This query did not complete successfully."
 msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -275,7 +333,7 @@ msgstr ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir pieejas atļauja ceļa mērķim."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -285,7 +343,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -297,7 +355,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "programmatūras iegūšanas no saites zemāk.\n"
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -307,29 +365,29 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Nevaru atvērt adrešu gramatu"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "Izmantoju LDAP serveri anonīmi"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Neizdevās autentificēties.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIevadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, ko kalendārs parādīs"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 #, fuzzy
 msgid "The URI that the address book will display"
 msgstr "URI, ko kalendārs parādīs"
@@ -353,16 +411,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  Pa_rādīt atbalstītās bāzes"
 
-#: 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
@@ -377,62 +429,53 @@ msgstr "  Pa_rādīt atbalstītās bāzes"
 #: 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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Adrešu grāmatas uzstādījumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adrešu grāmatas resursi"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Adrešu grāmatas avoti..."
-
-#: 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 "Vienmēr"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Anonīmi"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -446,52 +489,52 @@ msgstr ""
 "Lūdzu klikšķiniet uz \"Beigt\" pogas, lai saglabātu jūsu tikko ievadītos "
 "uzstādījumus."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Savienojos"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Email address:"
 msgstr "Epasta _adrese:"
 
-#: 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 lietos šo DN, lai autentificētu jūs ar serveri"
 
-#: 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 lietos šo epasta adresi,lai autentificētu jūs ar serveri"
 
-#: 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 "Beigt"
 
-#: 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 "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Grupa"
 
-#: 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 "Nekad"
 
-#: 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"
@@ -507,23 +550,19 @@ msgstr ""
 "jūsu savienojumu. Paprasiet savam sistēmu administrātoram, vai jūsu LDAP "
 "serveris lieto tos protokolus."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Viens"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "M_eklēšanas mērogs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Meklēšana"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Izvēlētais:"
-
-#: 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"
@@ -532,7 +571,7 @@ msgstr ""
 "Izvēloties šo opciju, Evolution savienosies ar jūsu LDAP serveri tikai tad,\n"
 "ja jūsu LDAP serveris atbalsta SSL vai 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"
@@ -549,7 +588,7 @@ msgstr ""
 "savienojums jau\n"
 "ir drošs."
 
-#: 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"
@@ -563,7 +602,7 @@ msgstr ""
 "drošības\n"
 "kļūdu izmantojumiem."
 
-#: 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 "
@@ -574,7 +613,7 @@ msgstr ""
 "uzstādījumus LDAP\n"
 "meklējumiem, un konaktu izveidošanai un rediģēšanai."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -584,35 +623,35 @@ msgstr ""
 "Parādāmā nosaukuma norādīšana ir pēdējais pieprasītais solis LDAP servera "
 "konfigurēšanā."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Solis 1: Servera informācija"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Solis 2: Savienojamies ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Solis 3: Meklēšana direktorijā"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Apakš"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Atbalstītās meklēšanas bāzes"
 
-#: 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"
@@ -625,7 +664,7 @@ msgstr ""
 "sistēmu\n"
 "administrātoram, vai jums ir vajadzība mainīt šīs opcijas."
 
-#: 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"
@@ -636,7 +675,7 @@ msgstr ""
 "tiks uzsākti. \n"
 "Ja jūs atstāsiet šo tukšu, meklējumi sāksies no direktorijas koka saknes."
 
-#: 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"
@@ -651,7 +690,7 @@ msgstr ""
 "Meklēšanas mērogs \"one\" iekļaus ierakstus tikai vienu līmeni zemāk par "
 "jūsu bāzi.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 #, fuzzy
 msgid ""
 "This assistant will help you\n"
@@ -668,14 +707,14 @@ msgstr ""
 "par serveri. Lūdzu sazinieties ar jūsu sistēmu administrātoru ja jums \n"
 "ir nepieciešama palīdzība, meklējot šo informāciju."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Šis ir pilnais LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -686,7 +725,7 @@ msgstr ""
 "pārlieku \n"
 "lielu, tiks bremzēta jūsu adrešu grāmatas darbība."
 
-#: 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 "
@@ -696,7 +735,7 @@ msgstr ""
 "ka uzstādot to uz \"Epasta adrese\", tai ir nepieciešama anonīma pieeja jūsu "
 "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"
@@ -705,7 +744,7 @@ msgstr ""
 "Šis ir servera nosaukums, kas parādīsies jūsu Evolution mapju sarakstā.\n"
 "Tas ir tikai attēlošanas pēc."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -715,7 +754,7 @@ msgstr ""
 "Šis ir servera nosaukums, kas parādīsies jūsu Evolution mapju sarakstā.\n"
 "Tas ir tikai attēlošanas pēc."
 
-#: 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"
@@ -726,28 +765,28 @@ msgstr ""
 "piedāvāts standarta portu saraksts. Prasiet jūsu sistēmu administrātoram,\n"
 "kādu portu jums vajadzētu norādīt."
 
-#: 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 "Šī opcija kontrolē, cik ilgi notiks meklēšana."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "Izman_tot SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr "Izmantoju atšķirīgo vārdu (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Izmantoju epasta adresi"
 
-#: 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 "Kad iespējams"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -760,60 +799,48 @@ msgstr ""
 "informāciju. Lūdzu vaicājiet jūsu sistēmu administrātoram ja jūs nēsat "
 "pārliecināti par jūsu informāciju."
 
-#: 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 "_Attēlošanas nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: 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 "R_ediģēt"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Pieteikšanās metode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Porta numurs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr "_Taimouts (minūtes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "kartes"
 
-#: 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"
 
@@ -848,7 +875,7 @@ msgid "Send HTML Mail?"
 msgstr "Sūtīt HTML pastu?"
 
 #: 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 "Pievienot kontaktiem"
 
@@ -864,7 +891,7 @@ msgstr "Nosaukums"
 
 #: 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 "Avots"
 
@@ -942,7 +969,8 @@ msgstr "Kolabrācija"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
@@ -951,7 +979,7 @@ msgid "D_epartment:"
 msgstr "D_epartaments:"
 
 #: 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 "Detaļas"
@@ -1043,16 +1071,27 @@ msgstr "Ka_tegorijas..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Dzēst"
 
+#: 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 "R_ediģēt"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
@@ -1098,8 +1137,8 @@ msgid "_Web page address:"
 msgstr "_Web lapaspuses adrese:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 #, fuzzy
 msgid "Address"
 msgstr "_Adrese:"
@@ -1107,14 +1146,14 @@ msgstr "_Adrese:"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 #, fuzzy
 msgid "Editable"
 msgstr "Aktivizēt"
@@ -2104,9 +2143,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 #, fuzzy
 msgid "Jabber"
 msgstr "Nenosaukts saraksts"
@@ -2121,21 +2160,22 @@ msgid "MSN Messenger"
 msgstr "_Pasta vēstule"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Serviss kārtībā"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Lokācija: "
@@ -2146,118 +2186,101 @@ msgid "Username"
 msgstr "_Lietotājvārds:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Mājas"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Darbs"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Citi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 #, fuzzy
 msgid "Source Book"
 msgstr "Avots"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Jauns kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 #, fuzzy
 msgid "Changed"
 msgstr "Čada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Konta nosaukums"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr "Kategoriju redaktors nav pieejams."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontakts pieder šādām kategorijām:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr "Saglabāt konaktu kā VKarti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Darījumi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy
 msgid "Yahoo"
 msgstr "Joro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nevar atrast logdaļu laukam: `%s'"
@@ -2272,6 +2295,7 @@ msgid "_Edit Full"
 msgstr "Rediģēt pilnīgi"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Pilns vārds:"
@@ -2283,6 +2307,23 @@ msgstr ""
 "\n"
 "E-pasts:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adrese _2:"
@@ -2388,24 +2429,28 @@ msgstr "_Amats/tituls:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Konta nosaukums"
+msgid "Add IM Account"
+msgstr "Pasta konti"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
-msgstr "Pasta konti"
+msgid "_Account name:"
+msgstr "Konta nosaukums"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
+msgid "_IM Service:"
 msgstr "Serviss kārtībā"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Lokācija: "
 
+#: 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 "Locekļi"
@@ -2428,27 +2473,28 @@ msgstr "Ievadiet epasta adresi vai arī iemetiet kontaktu apakšējajā sarakst�
 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
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #, fuzzy
 msgid "Is New List"
 msgstr "Jauns saraksts"
 
 #. 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 "Kontaktu saraksta redaktors"
 
-#: 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 "Saglabāt Sarakstu kā VKarti"
 
@@ -2501,25 +2547,22 @@ msgid "No contacts"
 msgstr "Parādīt kontaktus"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Kontakts"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Kontakti"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakti"
+msgstr[1] "Kontakti"
 
-#: 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
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Kļūda izmantojot grāmatas skatu"
 
@@ -2532,133 +2575,132 @@ msgstr "Molde"
 msgid "Error modifying card"
 msgstr "Kļūda mainot karti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Vārds sākas ar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Epasts sākas ar"
 
-#: 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 "Kategorija ir"
 
 #. 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 "Jebkuršs lauks satur"
 
-#: 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 "Paplašināti..."
 
-#: 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 "Tips"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Adrešu grāmata"
 
-#: 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 "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Jauns kontakts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Jauns kontaktu saraksts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Iet uz mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Importēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr "Meklēt kontaktus..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adrešu grāmatas avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr "Pilot uzstādījumi..."
 
-#: 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 "Pārsūtīt kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr "Drukāt aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: 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 "Izgriezt"
 
-#. 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 "Kopēt"
 
-#: 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 "Ievietot"
 
-#: 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 "Pašreizējais skats"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2671,7 +2713,7 @@ msgstr ""
 "izmantot"
 
 #. 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 "Jebkura kategorija"
@@ -2705,8 +2747,6 @@ msgid "Car Phone"
 msgstr "Automašīnas telefons"
 
 #: 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 "Kategorijas"
 
@@ -2715,7 +2755,7 @@ msgid "Company Phone"
 msgstr "Kompānijas telefons"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Epasts"
 
@@ -2769,6 +2809,7 @@ msgid "Manager"
 msgstr "Menedžeris"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Mobilais telefons"
 
@@ -2777,7 +2818,7 @@ msgid "Nickname"
 msgstr "Iesauka"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Piezīme"
 
@@ -2786,7 +2827,7 @@ msgid "Office"
 msgstr "Birojs"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organizācija"
 
@@ -2844,19 +2885,19 @@ msgid "Web Site"
 msgstr "Web lapaspuse"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 #, fuzzy
 msgid "Width"
 msgstr "Platums:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 #, fuzzy
 msgid "Height"
 msgstr "Augstums:"
 
 #: 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 ""
 
@@ -2913,93 +2954,96 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrara"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 #, fuzzy
 msgid "Selected"
 msgstr "Izvēlētais:"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 #, fuzzy
 msgid "Has Cursor"
 msgstr "Uzdevumu kārtošana"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
 msgstr "Locekļi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
 msgstr "E-pasts"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Darbs"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Bostona"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Ponkē"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Personīgi"
+msgid "work"
+msgstr "Darbs"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Personīgi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "_Darba nosaukums:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
 msgstr "Mājas fakss"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Veiksmīgi"
 
-#: 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
@@ -3007,99 +3051,99 @@ msgstr "Veiksmīgi"
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karte nav atrasta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
-#: 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 "Atsaukts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Autentifikācija neizdevusies"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Pieprasīta autentifikācija"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS nav pieejams"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adrešu grāmata neeksistē"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinarda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: 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
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Kļūda pievienojot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Kļūda mainot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: 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
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Kļūda izņemot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3108,7 +3152,7 @@ msgstr ""
 "%d karšu atvēršana atvērs %d jaunus logus.\n"
 "Vai jūs tiešām vēlaties attēlot visas no šim kartēm?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3117,54 +3161,54 @@ msgstr ""
 "%s jau eksistē\n"
 "Vai tu vēlies to pārrakstīt?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Pārrakstīt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Kļūda saglabājot failu: %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 "saraksts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 #, fuzzy
 msgid "Move contact to"
 msgstr "Pārvietot karti uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopēt karti uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Pārvietot kartes uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopēt kartes uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
@@ -3201,36 +3245,33 @@ msgstr "Pievienot adresi eksistējošajam \"%s\" kontaktam"
 msgid "Querying Address Book..."
 msgstr "Meklēju adrešu grāmatā..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Rediģēt kontakta informāciju"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Apvienot e-pasta adreses"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "un %d citas kartes."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "un vēl viena karte."
+msgid_plural "and %d other contacts."
+msgstr[0] "un vēl viena karte."
+msgstr[1] "un vēl viena karte."
 
-#: 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
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Parādīt _pilnas galvenes"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Saglabāt konaktu kā VKarti"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Saglabāt adrešu grāmatā"
 
@@ -3384,7 +3425,7 @@ msgstr "Robežas"
 msgid "Number of columns:"
 msgstr "Kolonu skaits:"
 
-#: 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 "Opcijas"
 
@@ -3568,7 +3609,7 @@ msgid "Unnamed List"
 msgstr "Nenosaukts saraksts"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Ievadiet paroli"
@@ -3655,7 +3696,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution Kopsavilkuma komponente."
 
 #: 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"
@@ -3702,24 +3743,24 @@ msgstr "Snaust kādu laiku (minūtes)"
 msgid "_Edit appointment"
 msgstr "R_ediģēt tikšanos"
 
-#: 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 "Atvērt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3728,12 +3769,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: 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"
@@ -3745,7 +3786,7 @@ msgstr ""
 "nokonfigurēta nosūtīt epastu. Evolution tā vietā attēlos\n"
 "normālu atgādinātāja dialoga logu."
 
-#: 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 "
@@ -3762,7 +3803,7 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: 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 "Neprasīt vairāk man par šo programmu."
 
@@ -3937,13 +3978,13 @@ msgstr "Komentāri satur"
 msgid "Location contains"
 msgstr "Apraksts satur"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Neatbilstoši"
 
-#: 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 "Kalendārs"
 
@@ -3965,7 +4006,7 @@ msgid "Purge events older than"
 msgstr "atgriež mazāk kā"
 
 #: 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 "dienas"
 
@@ -3976,7 +4017,7 @@ 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.
 #: 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"
 
@@ -3998,78 +4039,78 @@ 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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Jauna tikšanās"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Tikšanās"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Jauna tikšanās visu dienu"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Visas _dienas tikšanās"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "New calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendārs:"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Izveidot jaunu mapi"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4099,11 +4140,6 @@ msgstr "Nedēļas skats"
 msgid "Month View"
 msgstr "Mēneša skats"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Skats pēc izvēles"
-
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4123,16 +4159,16 @@ msgstr "Atļauja liegta"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nevarēju atvērt mapi %s"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "URI, ko kalendārs parādīs"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Rādāmais skata tips"
 
@@ -4201,11 +4237,11 @@ msgstr ""
 msgid "extra times every"
 msgstr "papildus laiks katras"
 
-#: 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 "stundas"
 
-#: 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 "minūtes"
 
@@ -4228,11 +4264,11 @@ msgstr "Pamati"
 msgid "Date/Time:"
 msgstr "Datums/laiks:"
 
-#: 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 "Parādīt paziņojumu"
 
-#: 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 "Spēlēt skaņu"
 
@@ -4241,18 +4277,17 @@ msgstr "Spēlēt skaņu"
 msgid "Reminders"
 msgstr "Atgādinājums"
 
-#: 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 "Sāknēt programmu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#, fuzzy
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "Sūtīt epastu"
 
 #: 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 "Kopsavilkums:"
@@ -4283,7 +4318,7 @@ msgid "hour(s)"
 msgstr "stunda(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 "minūte(s)"
 
@@ -4293,8 +4328,8 @@ msgstr "tikšanās sākums"
 
 #. 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 "Aktivizēts"
 
@@ -4310,19 +4345,19 @@ msgstr "Nepārvietot"
 
 #: 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 "Deaktivizēt"
 
 #: 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 "Aktivizēt"
 
@@ -4346,7 +4381,7 @@ msgstr "30 minūtes"
 msgid "60 minutes"
 msgstr "60 minūtes"
 
-#: 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 "Trauksmes"
 
@@ -4371,7 +4406,7 @@ msgid "Days"
 msgstr "Dienas"
 
 #: 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 "A_ktivizēt"
 
@@ -4467,7 +4502,7 @@ msgid "Wednesday"
 msgstr "Trešdiena"
 
 #: 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 "Darba nedēļa"
 
@@ -4514,7 +4549,6 @@ msgid "_Fri"
 msgstr "_Piek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Galvenais"
 
@@ -4618,7 +4652,7 @@ msgstr ""
 "uzstādījumus."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 #, fuzzy
 msgid "New Task List"
 msgstr "Uzdevumu saraksts"
@@ -4793,28 +4827,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validācijas kļūda: %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 " uz "
 
-#: 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 " (Izpildīts "
 
-#: 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 "Izpildīts"
 
-#: 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 " (Līdz "
 
-#: 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 "Līdz"
 
@@ -4850,8 +4884,9 @@ msgstr "Žurnāla ieraksts - %s"
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: 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 "Saglabāt kā..."
 
@@ -4869,35 +4904,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Atsaukt operāciju"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Kalendārs"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Uzdevumu saraksts"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4929,20 +4949,29 @@ msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto žurnāla ierakstu?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+#, 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] ""
+"Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
+msgstr[1] ""
 "Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
+#: 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] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
+msgstr[1] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
+#: 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] ""
+"Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
+msgstr[1] ""
+"Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -5012,7 +5041,7 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: 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 "Tikšanās"
 
@@ -5085,8 +5114,6 @@ msgstr "K_alendārs:"
 
 #: 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 "Klasifikācija"
 
@@ -5141,13 +5168,13 @@ msgstr "_Sākuma laiks:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nekas"
 
@@ -5204,13 +5231,13 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: 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
@@ -5399,7 +5426,7 @@ msgid "_No recurrence"
 msgstr "Bez a_tkārtošanās"
 
 #: 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 "_Izņemt"
 
@@ -5442,7 +5469,7 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
-#: 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 ""
 
@@ -5451,6 +5478,28 @@ msgstr ""
 msgid "Save Event"
 msgstr "Kalendāra notikumi"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Izvēlēties mapi"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendārs"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "Uzdevumu saraksts"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Informācija par sanāksmi ir izveidota. Nosūtīt to?"
@@ -5480,39 +5529,39 @@ msgstr "% izpildīts"
 #: 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 "Pabeigts"
 
 #: 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 "Augsts"
 
 #: 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 "Progresā"
 
 #: 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 "Zems"
 
 #: 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 "Normāls"
 
 #: 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 "Nav iesākts"
 
@@ -5528,7 +5577,7 @@ msgstr "Nedefinēts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
+msgid "_Date completed:"
 msgstr "Izpildes datums:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5572,9 +5621,9 @@ msgstr "Nevaru atvērt adrešu gramatu"
 msgid "Con_fidential"
 msgstr "Konfidenciāli"
 
-#: 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 "Apraksts:"
 
@@ -5584,11 +5633,13 @@ msgid "Folder:"
 msgstr "M_ape:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "Sākum_a datums:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Datuma laikā:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5648,138 +5699,112 @@ msgid "Weekly"
 msgstr "Nedēļa"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d dienas"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 diena"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d nedēļas"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 nedēļa"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d stundas"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 stunda"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minūtes"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dienas"
+msgstr[1] "%d dienas"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minūte"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d nedēļas"
+msgstr[1] "%d nedēļas"
 
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundes"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d stundas"
+msgstr[1] "%d stundas"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 sekunde"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minūtes"
+msgstr[1] "%d minūtes"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Sūtīt epastu"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundes"
+msgstr[1] "%d sekundes"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Nezināma darbība, kas tiks izpildīta"
 
-#: 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 pirms tikšanās sākuma"
 
-#: 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 pēc tikšanās sākuma"
 
-#: 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 tikšanās sākumā"
 
-#: 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 pirms tikšanās beigām"
 
-#: 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 pēc tikšanās beigām"
 
-#: 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 tikšanās beigās"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s iekš %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 nezināma palaidēja tipam"
 
-#: 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 "Publisks"
 
-#: 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 "Privāts"
 
-#: 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 "Konfidenciāls"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Apraksts:"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Beigu datums"
 
-#: 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 "Sākuma datums"
 
-#: 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 "Kopsavilkums"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "krāsa"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-#, fuzzy
-msgid "component"
-msgstr "Tikšanās"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Brīvs"
@@ -5815,141 +5840,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 "Jā"
 
-#: 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 "Nē"
 
 #. 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 "Nezināms"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Periodisks"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Dzēšu izvēlētos objektus"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Atjaunināt objektus"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "Jauna _tikšanās...."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "Jauns visas di_enas notikums"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "Jauna sanāksme"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "Jauns uzdevums"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Drukāt..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Ievietot"
-
-#: 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 "Iet uz _dienu"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Iet uz datumu..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicēt brīvs/aizņemts informāciju"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Atvērt"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr "_Saglabāt kā..."
-
-#: 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 "_Izgriezt"
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopēt"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "Plānot _sanāksmi..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Pārsūtīt kā iKalendāru..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Uzstādījumi..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5994,33 +5917,86 @@ msgstr "80%"
 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 "Dzēšu izvēlētos objektus"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Atjaunināt objektus"
+
+#: 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 "_Atvērt"
+
+#: calendar/gui/e-calendar-table.c:1041
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Atvērt vēstuli"
 
-#: 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 "_Saglabāt kā..."
+
+#: 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 "_Drukāt..."
+
+#: 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 "_Izgriezt"
+
+#: 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 "_Kopēt"
+
+#: 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 "_Ievietot"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "_Nozīmēt uzdevumu"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "_Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt izvēlētos uzdevumus kā izpildītus"
 
-#: 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 "_Dzēst izvēlētos uzdevumus"
 
-#: 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 "Klikšķināt, lai pievienotu uzdevumu"
 
@@ -6029,38 +6005,101 @@ msgstr "Klikšķināt, lai pievienotu uzdevumu"
 msgid "% Complete"
 msgstr "% izpildīts"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Trauksmes"
-
-#: 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 "Izpildīts"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Izpildes datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Datuma laikā"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Ģeogrāfiskā pozīcija"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Sākuma datums"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: 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 "Jauna _tikšanās...."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Jauns visas di_enas notikums"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Jauna sanāksme"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Jauns uzdevums"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Izvēlēties _pavedienu"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Dzēst..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Publicēt brīvs/aizņemts informāciju"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Kopēt uz mapi..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Pār_vietot uz mapi..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "Plānot _sanāksmi..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Pārsūtīt kā iKalendāru..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Iet uz _dienu"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Iet uz datumu..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Uzstādījumi..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -6092,26 +6131,26 @@ msgstr "%02i minūšu sadaļas"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%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"
@@ -6120,106 +6159,98 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jā. (Sarežģīta atkārtošanās)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Katru dienu"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Katras %d dienas"
+msgid_plural "Every %d days"
+msgstr[0] "Katru dienu"
+msgstr[1] "Katru dienu"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Katru nedēļu"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Katras %d nedēļas"
+msgid_plural "Every %d weeks"
+msgstr[0] "Katru nedēļu"
+msgstr[1] "Katru nedēļu"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Katru nedēļu "
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Katras %d nedēļas "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Katru nedēļu "
+msgstr[1] "Katru nedēļu "
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " un "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dienā, "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "katru mēnesi"
+msgid_plural "every %d months"
+msgstr[0] "katru mēnesi"
+msgstr[1] "katru mēnesi"
 
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "katrus %d mēnešus"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Katru gadu"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Katrus %d gadus"
+msgid_plural "Every %d years"
+msgstr[0] "Katru gadu"
+msgstr[1] "Katru gadu"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " kopā %d reizes"
+#: 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] " kopā %d reizes"
+msgstr[1] " kopā %d reizes"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", beidzoties "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Sākas:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Beidzas:</b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Izpildīts:</b>"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Līdz:</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 "iKalendāra informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iKalendāra kļūda"
 
-#: 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 "Nezināma persona"
 
 #. 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."
@@ -6227,313 +6258,317 @@ msgstr ""
 "<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties darbību no "
 "izvēlnes zemāk."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Lokācija: "
+
 #. 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 "Statuss:"
 
-#: 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 "Apstiprināts"
 
-#: 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 "Pagaidām akceptēt"
 
-#: 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 "Noliegts"
 
-#: 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 "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Atjaunot"
 
-#: 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 "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: 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> ir publicējis informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Informācija par sanāksmi"
 
-#: 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> pieprasa %s klātbūtni sanāksmē."
 
-#: 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> pieprasa jūsu klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Sanāksmes iemesls"
 
-#: 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> vēlas pievienot jau eksistējošai sanāksmei."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Atjaunināta informācija par sanāksmi"
 
-#: 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> vēlas saņemt pēdīgo informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Informācijas par sanāksmi atjaunināšanas pieprasīšana"
 
-#: 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> ir atbildējis uz sanāksmes pieprasījumu."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Atbilde par sanāksmi"
 
-#: 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> ir atsaucis sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Sanāksmes atcelšana"
 
-#: 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> ir nosūtijis nesaprotamu vēstuli."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Nepareiza vēstule par sanāksmi"
 
-#: 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> ir publicējis informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Uzdevuma informācija"
 
-#: 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> pieprasa %s izpildīt uzdevumu."
 
-#: 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> pieprasa jums izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Uzdevuma priekšlikums"
 
-#: 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> vēlas pievienot jau eksistējošam uzdevumam."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Uzdevuma atjaunināšana"
 
-#: 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> vēlas saņemt pēdīgo informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Uzdevuma atjaunināšanas pieprasījums"
 
-#: 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> ir atbildējis uz uzdevuma nozīmēšanu."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Uzdevuma atbilde"
 
-#: 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> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Uzdevuma atsaukums"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Slikts uzdevuma ziņojums"
 
-#: 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> ir publicējis brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Brīvs/aizņemts informācija"
 
-#: 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> pieprasa tavu brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Brīvs/aizņemts pieprasījums"
 
-#: 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> ir atbildējis uz brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Brīvs/aizņemts atbilde"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/aizņemts ziņa"
 
-#: 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 "Ziņa, izskatās, ir nepareizi noformēta"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: 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 "Piesaistne nesatur atļautu kalendāra ziņu"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "Piesaistnei nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendāra fails nevarēja tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\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 ""
 "Apmeklētāja statuss nevar tikt atjaunināts, tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: 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 "Objekts ir nepareizs un nevar tikt atjaunināts\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 "Šī atbilde nav no pašreizējā apmeklētāja. Pievienot kā apmeklētāju?"
 
-#: 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 ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\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 "Ir kļūda CORBA sistēmā\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Objektu nevarēja atrast\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 "Jums nav pareizo atļauju, lai atjauninātu kalendāru\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Izņemšana pabeigta"
 
-#: 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 "Priekšmets nosūtīts!\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 "Priekšmets nevar tikt nosūtīts!\n"
 
@@ -6668,7 +6703,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6754,12 +6789,12 @@ msgstr "_Prioritāte:"
 msgid "Web Page:"
 msgstr "Lapa"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
-#: 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"
@@ -6769,7 +6804,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"
@@ -6777,12 +6812,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6791,47 +6826,49 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "Ielādēju attēlus"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nav tikšanos"
 
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Ielādēju attēlus"
+
+#: calendar/gui/gnome-cal.c:1799
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atvērt ar %s..."
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:2754
 #, fuzzy
 msgid "Purging"
 msgstr "Turīna"
@@ -6853,45 +6890,46 @@ msgid "February"
 msgstr "Februāris"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ej Uz Datumu"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Janvāris"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Jūlijs"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Jūnijs"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Marts"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Maijs"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Novembris"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktobris"
 
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Izvēleties Vārdu"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembris"
 
 #: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "_Go To Today"
-msgstr "Ej Uz Šodien"
+msgid "_Select Today"
+msgstr "Izvēlieties mapi"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6973,7 +7011,7 @@ msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr ""
 
@@ -7130,81 +7168,81 @@ msgid "Sa"
 msgstr "Sd"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izvēlēta diena (%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 "Izvēlētā nedēļa (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Izvēlētais mēnesis (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Uzdevums"
 
-#: 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 "Prioritāte: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenti Izpidildīti: %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 "Kategorijas: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontakti:"
 
-#: 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 "Drukāšanas Pirmsapskats"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Drukāt Priekšmetu"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
@@ -7213,39 +7251,39 @@ msgstr "Drukāšanas Uzstādijumi"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "New task list"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 #, fuzzy
 msgid "_Task List"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8895,7 +8933,7 @@ msgstr "Nevarēju izveidot keiša ceļu"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nevarēju izdzēst keiša ierakstu: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8906,7 +8944,7 @@ msgstr ""
 "Tālākās operācijas šajā serverī netiks attēlotas kad jūs\n"
 "pārvienosieties ar tīklu."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8917,7 +8955,7 @@ msgstr ""
 "%s\n"
 "Izmaiņas, izdarītas šajā folderī, netiks pārsinhronizētas."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Pārsinhronizējamies ar serveri"
 
@@ -8934,7 +8972,7 @@ msgstr ""
 msgid "Preparing folder '%s' for offline"
 msgstr "Sagatavojam mapi '%s' nesaistei"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
@@ -9049,30 +9087,34 @@ msgstr "(match-all) pieprasa vienu būla rezultātu"
 msgid "Performing query on unknown header: %s"
 msgstr "Izpildu pieprasījumu uz nezināmas galvenes: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Neatbalstīta operācija: pievienot vēstuli: priekš %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Neatbalstīta operācija: meklēšana pēc izteiksmes: priekš %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Neatbalstīta operācija: meklēšana pēc uids: priekš %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Pārvietojam vēstules"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Kopēju vēstules"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Saņemu %d vēstuli(es)"
@@ -9107,7 +9149,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 "Atsaukts."
 
@@ -9481,7 +9524,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -9683,7 +9726,7 @@ msgstr "Parsēšanas kļūda"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Serveris: %s, Tips: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevaru dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
@@ -9692,21 +9735,22 @@ msgstr "Nevaru dabūt mapi: Nepareiza operācija šajā glabātuvē"
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevaru izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
 msgid "Trash"
 msgstr "Atkritummape"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jūnijs"
@@ -9936,17 +9980,17 @@ msgstr "Nav tādas vēstules %s iekš %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
@@ -9982,40 +10026,39 @@ msgstr "Attiecināt filtrus uz jaunām vēstulēm INBOX šajā serverī"
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
 #, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Servera nosaukums"
+msgid "Address Book And Calendar"
+msgstr "Adrešu grāmata"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Meklēšanas bāze:"
+#: 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 ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Parole"
 
-#: 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 "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
 
-#: 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
 #, fuzzy
 msgid "Checklist"
 msgstr "Bieza dūmaka"
@@ -10023,12 +10066,12 @@ msgstr "Bieza dūmaka"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojās: %s"
@@ -10086,12 +10129,12 @@ msgstr "Mape tika iznīcināta un pārizveidota uz servera."
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: 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 "Nespēju saņemt vēstuli: %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
@@ -10107,25 +10150,25 @@ msgstr ""
 "Nevar dabūt vēstuli: %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 "Nav tādas vēstules"
 
-#: 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 "Šī vēstule šobrīd nav pieejama"
 
-#: 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 "Saņemu kopsavilkuma informāciju par jaunām vēstulēm"
 
-#: 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 "Nevarēju atrast vēstules ķermeni FETCH atbildē."
 
@@ -10203,18 +10246,18 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP serveris %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 serviss priekš %s uz %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
@@ -10224,15 +10267,15 @@ msgstr "IMAP serviss priekš %s uz %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nevarēja savienoties ar %s (ports %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
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "TLS nav pieejams"
 
-#: 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
@@ -10240,49 +10283,49 @@ msgstr "TLS nav pieejams"
 msgid "Connection cancelled"
 msgstr "Konekcija pārtraukta"
 
-#: 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 "Nevar savienoties ar IMAP serveri %s drošības režīmā: %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 paplašinājums nav atbalstīts."
 
-#: 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 sarunas neizdevušās"
 
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nevarēju savienoties ar serveri: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Neatbalstīts autentifikācijas tips %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLūdzu ievadi IMAP paroli %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10293,32 +10336,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%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:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezināma vecāku mape: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
@@ -10351,20 +10395,20 @@ msgid "Index message body data"
 msgstr "Sūtīt vēstuli kontaktam"
 
 #. $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 "pastkaste:%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)"
@@ -10424,7 +10468,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"
@@ -10473,8 +10517,8 @@ msgstr "Nevarēju izdzēst mapes kopsavilkuma failu `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nevarēju izdzēst mapes indeksa failu `%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
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nevarēju izdzēst mapes kopsavilkuma failu `%s': %s"
@@ -10504,14 +10548,14 @@ msgstr "Nepareizs vēstules saturs"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mape '%s' neeksistē."
@@ -10530,7 +10574,7 @@ msgstr "`%s nav maildir direktorija."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nevarēju izdzēst mapi `%s': %s"
@@ -10539,28 +10583,28 @@ msgstr "Nevarēju izdzēst mapi `%s': %s"
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nevarēju skanēt mapi `%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 "Nevaru atvērt maildir direktorijas ceļu: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Pārbaudu mapes nepretrunīgumu"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Meklēju jaunās vēstules"
 
-#: 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
@@ -10608,7 +10652,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Nevaru izveidot mapi ar šādu nosaukumu"
@@ -10639,32 +10683,32 @@ msgstr "`%s' nav regulārs fails."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mape `%s' nav tukša. Netika izdzēsta."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Norādītais mapes nosaukums nav pareizs: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
@@ -10708,7 +10752,7 @@ msgstr "Nevarēju aizvērt avota mapi %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nevarēju aizvērt pagaidu mapi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nevarēju pārsaukt mapi: %s"
@@ -10751,14 +10795,14 @@ msgstr "MH vēstules pievienošana atsaukta"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Nevarēju izveidot mapi `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Nevaru dabūt mapi: %s: %s"
@@ -11039,47 +11083,47 @@ msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nevaru pārvietot mapi uz vienu no tās apakšmapēm."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Nezināma kļūda: %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 "Nav tādas mapes: %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 "Nevaru dabūt grupu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nevarēju sagatavot vēstuli: %s"
 
-#: 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 komanda neizdevusies: %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: Meklēju jaunas vēstules"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nezināma servera atbilde: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Izmantot atsaukumu"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operācija neizdevusies: %s"
@@ -11126,7 +11170,7 @@ msgstr "Dzēst pēc %s dienas(ām)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11215,7 +11259,7 @@ msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%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"
 
@@ -11267,12 +11311,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pasta nosūtīšana ar sendmail programmu"
 
-#: 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 ""
 "Pasta izsūtīšanai savienojoties uz attālinātu pasta hubu, izmantojot SMTP.\n"
 
@@ -11393,13 +11438,14 @@ msgid "server does not appear to support SSL"
 msgstr "serveris neatbalsta SSL protokolu"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS pieprasījums iztecējis: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP komandas kļūda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS atbildes kļūda"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP komandas kļūda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -11433,153 +11479,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP pasta nosūtīšana caur  %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Nevaru nosūtīt vēstuli: nav noteikta sūtītāja adrese."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Nevar nosūtīt adresi: sūtītāja adrese nav pareiza."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Nevaru nosūtīt vēstuli: nav norādīti adresāti."
 
-#: 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 "Nevaru nosūtīt vēstuli: viens vai vairaki nepareizi adresāti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP apsveikums (Greeting)"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO pieprasījums iztecējis: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO atbildes kļūda"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda izveidojot SASL autentifikācijas objektu."
 
-#: 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 pieprasījums iztecējis: %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 komandas kļūda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH pieprasījums neveiksmīgs."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP komandas kļūda: %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 "Slikta autentifikācijas atbilde no servera.\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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM atbildes kļūda"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO pieprasījums iztecējis: %s: pasts nav nosūtīts"
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO atbildes kļūda: %s: pasts nav nosūtīts"
 
-#: 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) neizdevies"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
+#: 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 atbildes kļūda: %s: pasts nav nosūtīts"
 
 #. 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 atbildes kļūda"
-
-#: 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 sūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA pārtraukuma atbildes kļūda"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP komandas kļūda: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET pieprasījums iztecējis: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET atbildes kļūda"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT pieprasījums iztecējis: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT atbildes kļūda"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP komandas kļūda: %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 "piesaistne"
 
-#: 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 "Izņemt izvēlētos priekšmetus no piesaistņu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
 msgstr "Pievienot piesaitni..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
 msgstr "Piesaistīt failu vēstulei"
 
-#: 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 "Nevar piesaistīt failu %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 "Nevar piesaistīt failu %s: neregulārs fails"
@@ -11602,23 +11652,23 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku piesaistnes attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Jums vajag konfigurēt identitāti,\n"
 "pirms jūs varēsiet sacerēt vēstuli."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicējuma mērķis"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Piesaistīt failu vēstulei"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
@@ -11629,45 +11679,45 @@ msgstr "Uz adrešu grāmatu"
 #. * 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 "Atbildēt Kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules adresātus"
 
-#: 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 "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: 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."
@@ -11678,11 +11728,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "Publicēts uz:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
@@ -11692,20 +11742,20 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Attach file(s)"
 msgstr "Piesaistīt failu"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Nevaru kodēt šo vēstuli: nav parastā teksta, ko kodēt"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11714,30 +11764,30 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: 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 "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11746,7 +11796,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11755,7 +11805,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11764,7 +11814,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11773,7 +11823,7 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11782,7 +11832,7 @@ msgstr ""
 "Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās sesijas.\n"
 "Vai jūs gribētu tos atjaunot?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11794,42 +11844,47 @@ msgstr ""
 "Vai jūs vēlaties saglabāt izmaiņas?"
 
 #: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Nenosaukta vēstule)"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta vēstule"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Paraksts:"
-
-#: 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 "Autoģenerēts"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Paraksts:"
+
+#: composer/e-msg-composer.c:2316
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
 msgid "Compose a message"
 msgstr "Uzrakstīt vēstuli"
 
-#: 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."
@@ -11837,7 +11892,7 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Neizdevās aktivizēt adrešu izvēlētāja kontroli."
 
-#: 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"
@@ -11849,7 +11904,7 @@ msgstr ""
 "Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
 "un libgtkhtml pareizās versijas.\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."
@@ -11857,7 +11912,7 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Nespēju aktivizēt HTML redaktora komponenti."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11981,7 +12036,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11989,15 +12044,15 @@ msgstr ""
 "Fails ar šadu nosaukumu jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
 msgstr "Pārrakstīt failu?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Atcerēties šo paroli"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Atcerēties šo paroli uz atlikušo sesiju"
 
@@ -12080,13 +12135,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12095,98 +12150,79 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 sekunde"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 sekunde"
+msgstr[1] "1 sekunde"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, fuzzy, c-format
-msgid "%d seconds ago"
-msgstr "%d sekundes"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
 msgid "1 minute ago"
-msgstr "1 minūte"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minūte"
+msgstr[1] "1 minūte"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, fuzzy, c-format
-msgid "%d minutes ago"
-msgstr "%d minūtes"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
 msgid "1 hour ago"
-msgstr "1 stunda"
+msgid_plural "%d hours ago"
+msgstr[0] "1 stunda"
+msgstr[1] "1 stunda"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, fuzzy, c-format
-msgid "%d hours ago"
-msgstr "%d stundas"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
 msgid "1 day ago"
-msgstr "1 diena"
+msgid_plural "%d days ago"
+msgstr[0] "1 diena"
+msgstr[1] "1 diena"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, fuzzy, c-format
-msgid "%d days ago"
-msgstr "%d %s atpakaļ"
-
-#: filter/filter-datespec.c:69
-#, fuzzy
 msgid "1 week ago"
-msgstr "1 nedēļa"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 nedēļa"
+msgstr[1] "1 nedēļa"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, fuzzy, c-format
-msgid "%d weeks ago"
-msgstr "%d nedēļas"
-
-#: filter/filter-datespec.c:70
-#, fuzzy
 msgid "1 month ago"
-msgstr "mēnesis"
-
-#: filter/filter-datespec.c:70
-#, fuzzy, c-format
-msgid "%d months ago"
-msgstr "%d %s atpakaļ"
+msgid_plural "%d months ago"
+msgstr[0] "mēnesis"
+msgstr[1] "mēnesis"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, c-format
 msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, fuzzy, c-format
-msgid "%d years ago"
-msgstr "%d %s atpakaļ"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
 msgstr "Jums jāizvēlās datumu."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<klikšķini šeit, lai izvēlētos datumu>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
 msgstr "tagad"
 
 #. 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 "Izvēlieties laiku ar ko salīdzināt"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Filtra noteikumi"
 
 #: filter/filter-file.c:166
@@ -12194,27 +12230,28 @@ msgstr "Filtra noteikumi"
 msgid "You must specify a file name."
 msgstr "Jums ir jānorāda faila vārds"
 
-#: 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 "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
 msgstr "Izvēlieties failu"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Tad"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Līdz:</b>"
 
 #: filter/filter-folder.c:153
 #, fuzzy
 msgid "You must specify a folder."
 msgstr "Jums ir jānorāda mape.\n"
 
-#: 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 "Izvēlēties mapi"
 
@@ -12228,23 +12265,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 "Svarīgs"
 
 #. 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 "Darāmais"
 
 #. 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 "Vēlāk"
 
-#: 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 "Tests"
 
@@ -12252,59 +12289,63 @@ msgstr "Tests"
 msgid "You must name this filter."
 msgstr "Jums jānosauc šis filtrs."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
 msgstr "Noteikuma nosaukums:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
 msgstr "Nenosaukts"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Ja"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Līdz:</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
 msgstr "Aktivizēt darbības"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "ja visi kritēriji sakrīt"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
 msgstr "ja jebkuršs kritērijs sakrīt"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "ienākošais"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "izejošais"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Salīdzināt ar"
+msgid "    "
+msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Rediģēt filtrus"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filtra noteikumi"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Rediģēt vMapes"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vMapes avoti"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Salīdzināt ar"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Ienākošais"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Izejošais"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12312,7 +12353,7 @@ msgstr ""
 "Vēstules datums tiks salīdzināts ar\n"
 "plkst. 00:00 norādītajā datumā."
 
-#: 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."
@@ -12320,7 +12361,7 @@ msgstr ""
 "Vēstules datums tiks salīdzināts ar\n"
 "relatīvo laiku, kad notiks filtrēšana."
 
-#: 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."
@@ -12328,59 +12369,51 @@ msgstr ""
 "Vēstules datums tiks salīdzināts ar\n"
 "pašreizējo laiku, kad notiks filtrēšana."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtuālās mapes"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "laiks, relatīvs attiecībā uz pašreizējo laiku"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "atpakaļ"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "mēneši"
 
-#: 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 "sekundes"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "tikai specifiskas mapes"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "pašreizējais laiks"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "laiks, kuru jūs norādiet"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vMapes avoti"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nedēļas"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "ar visām akīvajām attālinātajām mapēm"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "ar visām lokālām mapēm"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "gadi"
 
@@ -12514,7 +12547,7 @@ msgstr "nav karogots"
 msgid "Junk Test"
 msgstr "Jūnijs"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Iezīme"
@@ -12546,8 +12579,9 @@ msgid "Move to Folder"
 msgstr "Pārvietot uz mapi"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Kanālot vēstuli uz čaulas komandu"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Iziet no programmas"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12581,23 +12615,24 @@ msgstr "atgriež lielāku kā"
 msgid "returns less than"
 msgstr "atgriež mazāk kā"
 
-#: 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 "Palaist programmu:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Rezultāts"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Sūtītajs"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Uzstādīt statusu"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Čaulas komanda"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Izmērs (kB)"
@@ -12622,9 +12657,9 @@ msgstr "sākas ar"
 msgid "Stop Processing"
 msgstr "Apturēt procesēšanu"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subjekts"
@@ -12633,17 +12668,13 @@ msgstr "Subjekts"
 msgid "Unset Status"
 msgstr "Noņemt statusu"
 
-#: 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
 #, fuzzy, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Noteikuma nosaukums '%s' nav unikāls, izvēlieties citu"
 
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Noteikumi"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Pievienot noteikumu"
 
@@ -12656,8 +12687,9 @@ msgstr "Rediģēt noteikumu"
 msgid "Rule name"
 msgstr "Noteikuma nosaukums:"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
 msgstr "Rezultāta noteikumi"
 
 #: filter/searchtypes.xml.h:1
@@ -12692,16 +12724,21 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuālās mapes"
+
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Jums jānosauc šī vmape."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Jums jānorāda vismaz viena mape kā avots."
 
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
 #, fuzzy
 msgid "VFolder source"
 msgstr "vMapes avoti"
@@ -12760,8 +12797,8 @@ msgstr "Evolution pasta mapes attēlošanas komponents."
 msgid "Evolution Mail preferences control"
 msgstr "Evolution pasta izpildkopsavilkuma komponente."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Pasts"
@@ -12770,56 +12807,52 @@ msgstr "Pasts"
 msgid "Mail Accounts"
 msgstr "Pasta konti"
 
-#: 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 "Pasta Preferences"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
 msgstr "Nedzēst"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
 msgstr "[Noklusētais]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
 msgstr "Konta nosaukums"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
 msgstr "Protokols"
 
-#: 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 "Bezvārda"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Lūdzu norādiet atļautu skripta nosaukumu"
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-#, fuzzy
-msgid "[script]"
-msgstr " [skripts]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
 #, fuzzy
 msgid "Language(s)"
 msgstr "Valoda"
 
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Pievienot skripta parakstu"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "Izvēlieties paraksta skriptu"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Paraksti"
@@ -12876,7 +12909,7 @@ msgstr ""
 "Nevaru atvērt melnraksta mapi šim kontam.\n"
 "Vai jūs vēlaties izmantot noklusēto melnrakstu mapi?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _virtuālo mapi no meklējuma..."
 
@@ -12910,300 +12943,330 @@ msgstr "Nākošā _neizlasītā vēstule"
 msgid "<click here to select a folder>"
 msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Norādīt, kur lai izveidotu mapi:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Mapes nosaukums:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
 msgstr "vMapes"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Iesūtne"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Ielādēju..."
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Izņemu mapi %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Atveru mapi %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Pārvietoju vēstules uz %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Kopēju vēstules uz %s"
+
+#: mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Glabāju mapi '%s'"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nevarēju izdzēst mapi `%s': %s"
 
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Patiešām izdzēst mapi \"%s\"?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dzēst \"%s\""
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Pārdēvēt mapi"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Skatīt"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Atvērt jaunā logā"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 #, fuzzy
 msgid "_Move"
 msgstr "Pārvietot"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Jauna mape"
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Rekvizīti..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atbildēt _visiem"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
 msgstr "S_ekojums..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
 msgstr "Ka_rodziņš pabeigts"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā lasītu"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne_svarīgu"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
 msgstr "Pār_vietot uz mapi..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
 msgstr "A_ttiecināt filtrus"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Filtra noteikumi"
+
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VMape ar subjektu"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r adresātiem"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar adresātu sarakstu"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz subjektu"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrs uz sūtītāju"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Noklusētais"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopēt saites lokāciju"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Atbilstumi:"
 
-#: 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
 #, fuzzy
 msgid "Unsigned"
 msgstr "Asignēts"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13212,12 +13275,12 @@ msgstr ""
 "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: 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
 #, fuzzy
 msgid "Valid signature"
 msgstr "Rediģēt parakstu"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13226,101 +13289,101 @@ msgstr ""
 "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: 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
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Rediģēt parakstu"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Pārtraukts"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP kodējums"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikāta ID:"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifikāts vēl nav derīgs"
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
 msgstr "Nokavētie:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 #, fuzzy
 msgid "_View Inline"
 msgstr "Skatīt iekļauti"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 #, fuzzy
 msgid "_Hide"
 msgstr "Slēpt"
@@ -13330,128 +13393,164 @@ msgstr "Slēpt"
 msgid "Page %d of %d"
 msgstr "%d. lapa no %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
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Sliktformēta ārējā ķermeņa daļa."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%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 "Norāde uz lokālu failu (%s) atļautu saitē \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Norāde uz attālinātiem datiem (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
 #, fuzzy
 msgid "Formatting message"
 msgstr "Pārvietojam vēstules"
 
-#: 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 "No"
 
-#: 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 "Atbildēt-Uz"
 
-#: 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 "Kam"
 
-#: 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"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
 msgid "Mailer"
 msgstr "Pastnieks"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: 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 piesaistne"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Neatbalstīta shēma"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Neizdodas pārbaudīt lapas parakstu"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Neizdodas pārbaudīt lapas parakstu"
 
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Katru gadu"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "_Viena diena"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Viena n_edēļa"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Viens _mēnesis"
+
 #: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13460,22 +13559,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Neizdevās keišot %s: %s"
 
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Neizdevās keišot %s: %s"
 
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
@@ -13518,34 +13617,34 @@ msgstr "Pievienot adrešu grāmatu"
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 #, fuzzy
 msgid "Subscribed"
 msgstr "Pierakstīties"
 
-#: 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 "Mape"
 
 #. 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 "Lūdzu izvēlieties serveri."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
 msgstr "Nerādīt šo ziņu vēlreiz."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13554,27 +13653,27 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
 #. 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
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13583,7 +13682,7 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13592,38 +13691,38 @@ msgstr ""
 "Fails '%s' jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
 #, fuzzy
 msgid "message"
 msgstr "Vēstule"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 #, fuzzy
 msgid "Save Message..."
 msgstr "Saglabāt vēstuli kā..."
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
 #, fuzzy
 msgid "Add address"
 msgstr "_Adrese:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Pasts no %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13636,7 +13735,7 @@ msgstr ""
 "\n"
 "Patiešām izdzēst šīs vēstules?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13716,279 +13815,313 @@ msgstr "Vēstules noklusētais subjekts."
 
 #: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Vēstules noklusētais subjekts."
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
 msgid "Default reply style"
 msgstr "Noklusētais pārsūtīšanas stils ir:"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: 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 "Norādīt, vai tiek rādīta mapes josla"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: 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 ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Sūtīt šo vēstuli vēlāk"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: 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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of accounts"
 msgstr "Pasta konti"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Parādīt vēstuli normālā stilā"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Apskata lauks"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Terminal font"
 msgstr "Oriģinālais kontakts:"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: 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;"
@@ -13996,113 +14129,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Sasaistīts vēstuļu saraksts"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Sasaistīts vēstuļu saraksts"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Mainīgs platums:"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 #, fuzzy
 msgid "spamd port"
 msgstr "Importēt"
@@ -14146,14 +14279,14 @@ msgstr "Evolution importē jūsu veco Eim pastu"
 #: 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 "Importēju..."
 
 #: 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 "Lūdzu uzgaidiet"
 
@@ -14202,12 +14335,12 @@ msgstr "Importējam failus"
 msgid "Scanning %s"
 msgstr "Skanējam %s"
 
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritātes filtrs \"%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"
@@ -14233,7 +14366,7 @@ msgstr ""
 "vietā. Pārbaudiet importētos filtrus, lai pārliecinātos,\n"
 "kas viss strādā kā plānots."
 
-#: 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"
@@ -14245,7 +14378,7 @@ msgstr ""
 "\"Watch Thread\" (Skatīt pavedienu)\n"
 "iespēju, kas netiek atbalstīta Evolution. Šie filtri tiks ignorēti."
 
-#: 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"
@@ -14259,24 +14392,24 @@ msgstr ""
 "tiks pārveidoti ar vienkāršu testu, kas pārbaudīs, vai virkne ir\n"
 "vai nav vēstules ķermenī."
 
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
 msgid "Mail Filters"
 msgstr "Pasta filtri"
 
-#: 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?"
@@ -14309,62 +14442,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Pašreizējais glabātuves formāts:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Indeksa ķermenis satur"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Jauns glabātuves formāts:"
-
-#: 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 ""
-"Piezīme: Kad notiek konvertēšana starp pastkašu formātiem, neizdošanās\n"
-"(piemēram, diska vietas trūkuma gadījumā) var nebūt automātiski\n"
-"atsaucama. Lūdzu izmantojiet šo darbību rūpīgi."
-
-#: 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 "Jūs neesat aizpildijis visu pieprasīto informāciju."
 
 #. 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 kontu redaktors"
 
-#: 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 "_Hosts:"
 
-#: 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 "_Lietotājvārds:"
 
-#: 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 "_Ceļš:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
 msgid "You may not create two accounts with the same name."
 msgstr "Jūs nevarat izveidot divus kontus ar vienādiem nosaukumiem."
 
@@ -14397,11 +14496,11 @@ msgstr "Atbildēts uz"
 msgid "Add Filter Rule"
 msgstr "Pievienot filtra noteikumus"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
 msgstr "Sekojoši filtru noteikumi:\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14412,47 +14511,47 @@ msgstr ""
 "    '%s'\n"
 "Un tiek atjaunota."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Jums ir nenosūtītas vēstules, vai jūs vēlaties iziet jebkurā gadījumā?"
 
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Jauna vMape"
 
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pasta filtri"
 
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, ko kalendārs parādīs"
 
-#: 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 "Identitāte"
 
-#: 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 "
@@ -14462,12 +14561,13 @@ msgstr ""
 "tikt neaizpildīti, kāmēr jūs nevēlaties iekļaut šo informāciju epastā ko "
 "nosūtāt."
 
-#: 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
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Saņemot pastu"
 
-#: 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."
@@ -14476,16 +14576,16 @@ msgstr ""
 "neesat pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet "
 "servisa piegādātājam."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "_Sūtot pastu"
 
-#: 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."
@@ -14494,11 +14594,11 @@ msgstr ""
 "pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet servisa "
 "piegādātājam."
 
-#: 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 "Kontu pārvaldība"
 
-#: 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 "
@@ -14512,125 +14612,258 @@ msgstr ""
 "kontu. Lūdzu ievadiet konta nosaukumu laukumā zemāk. Šis nosaukums tiks "
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
 msgid "Checking Service"
 msgstr "Pārbaudam servisu"
 
-#: 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 "Savienojamies ar serveri..."
 
-#: 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 " _Pārbaudīt atbalstītos paņēmienus"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Pirmsapskats"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Sākas:</b> "
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "_Valoda:"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Kontu redaktors"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Kontu informācija"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Pārbaudīt jauno pastu"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Pievienot sk_riptu"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Pievienot jaunu parakstu..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Vienmēr nosūtīt _aklo kopiju (Cc) uz:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Vienmēr nosūtīt _kopiju (Cc) uz:"
+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
+#, fuzzy
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "Ziņa, ko attēlot"
+
+#: 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 "Ziņošana par jaunu pastu"
+
+#: 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 "Nosūtītās un melnraksta vēstules"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Kontu redaktors"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Pievienot jaunu parakstu..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Pievienot sk_riptu"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Vienmēr nosūtīt _kopiju (Cc) uz:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Vienmēr nosūtīt _aklo kopiju (Cc) uz:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Kodējot, vienmēr _uzticēties atslēgām manā atslēgu rinķī"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Piesaistīt orģinālo vēstuli"
 
-#: 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 "Piesaistne"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autentifikācija"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Automātiski ievietot smaidiņu attēlus"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Automātiski parbaudīt jauno pastu"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltijas (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltijas (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Pīkstēt, kad ir saņemts jauns pasts"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Rakst_zīmju kopa:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Krāsas"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " _Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Pārbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Pārbaudīt pareizrakstību kāmēr es _rakstu"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Pārbaudīt jauno pastu"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Krāsa _kļūdainajiem vārdiem:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Sacerēt vēstules"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Krāsas"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Konfigurācija"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Apstiprināt, iztīrot mapi"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14647,280 +14880,264 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Noklusētā uzvedība"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Noklusētais rakstzīmju ko_dējums:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Pasta dzēšana"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:68
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
+msgid "Defaults"
+msgstr "_Noklusētie"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Necitēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _sanāksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: 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 "Izdarīts"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Epasta konti"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "Epasta _adrese:"
 
-#: 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 "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontu asistents"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Izpildīt komandu..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "Fiksē_ts -platums:"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "<< Mazāk opcijas"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Fontu rekvizīti"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Formatēt vēstules _HTML"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML pasts"
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "H_eaders"
+msgid "Headers"
 msgstr "Galvene"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Izcelt _citātus ar"
 
-#: 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 "Iekļaut"
 
-#: 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 "Iezīmes un krāsas"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Ielādēju attēlus"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Pasta konfigurācija"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Vēstuļu sacerētājs"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Vēstules attēlošana"
-
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "Vēstule satur"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Ziņošana par jaunu pastu"
-
-#: 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"
 msgstr ""
 "Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Optionāla informācija"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganizācija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: 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 "Drukātie fonti"
-
-#: 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 "Citēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Atc_erēties šo paroli"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Atcerēties šo paroli"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Saņemu epastu"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "Saņemšanas _opcijas"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Atcerēties šo _paroli"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Pieprasītā informācija"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Atcerēties šo paroli"
 
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Atjaunot noklusējumus"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Drošais MIME (S/MIME)"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Dzēst..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Sūtu epastu"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Nosūtītās un melnraksta vēstules"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Servera konfigurācija"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Servera _tips: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ķēdē pašparakstīts sertifikāts"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Paraksts:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Paraksti"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Norādiet _faila nosaukumu:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "Oriģinālais kontakts:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Tips:"
+
+#: 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"
@@ -14930,7 +15147,7 @@ msgstr ""
 "paraksts. Nosaukums, kuru norādīsiet, tiks\n"
 "izmantots tikai attēlošanas nolūkos."
 
-#: 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 "
@@ -14940,7 +15157,7 @@ msgstr ""
 "Valodu saraksts šeit parāda tikai tās valodas, kurām jums ir uzstādīta "
 "vārdnīca."
 
-#: 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\""
@@ -14948,15 +15165,15 @@ msgstr ""
 "Ievadiet nosaukumu, kādu jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Mainīgs platums:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -14967,182 +15184,110 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Pievienot parakstu"
 
-#: 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 "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Autentifikācijas tips:"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Autentifikācijas tips:"
-
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:158
 #, fuzzy
-msgid "_Automatically check for new mail every"
-msgstr "_Automātiski parbaudīt jauno pastu"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Automātiski ievietot smaidiņu attēlus"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Pīkstēt, kad ir saņemts jauns pasts"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Apstiprināt, iztīrot mapi"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Noklusētais paraksts:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Noklusētie"
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neziņojiet _man, kad ierodas jauns pasts"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Aktivizēt"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Pārsūtīšanas stils:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Pilns vārds:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML pasts"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identitāte"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "Jūnijs"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā lasītas pēc"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Vārds:"
 
-#: 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 "_Nekad neielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
-
-#: 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 "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Norādīt, kad sūta vēstules ar tukšu subjekta rindu"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Saņemot pastu"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Atjaunot noklusējumus"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Skripts:"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Dzēst..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Sūtot pastu"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Paraksti"
-
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Standard Font:"
-msgstr "Sand Point"
-
-#: mail/mail-config.glade.h:177
-#, fuzzy
-msgid "_Terminal Font:"
-msgstr "Oriģinālais kontakts:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minūte(s)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "krāsa"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15151,7 +15296,7 @@ msgstr ""
 "Kļūda kamēr '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15160,7 +15305,7 @@ msgstr ""
 "Kļūda izpildot operāciju:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Strādāju"
 
@@ -15168,132 +15313,131 @@ msgstr "Strādāju"
 msgid "Filtering Folder"
 msgstr "Filtrējam mapi"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Sūtu \"%s\""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Kļūda pie %d vēstules no %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Neizdevās atkodēt vēstuli."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importējam %s kā %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokālās mapes"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Saņemu %d vēstuli(es)"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Saņemu %d vēstuli(es)"
+msgstr[1] "Saņemu %d vēstuli(es)"
 
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Saglabāju %d vēstuli(es)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Saglabāju %d vēstuli(es)"
+msgstr[1] "Saglabāju %d vēstuli(es)"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15302,7 +15446,7 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15311,11 +15455,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15324,25 +15468,21 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
 
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Reģistrjūtīgs"
@@ -15355,88 +15495,82 @@ msgstr "Meklēt vēstulē"
 msgid "Find:"
 msgstr "Meklēt:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Meklēšana"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-#, fuzzy
-msgid "Digital Signature"
-msgstr "Rediģēt parakstu"
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Izņēmumi"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
 msgstr "Avota informācija"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
 msgstr "Atsaucu..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ceļš: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
 msgstr "Tips: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
 msgstr "Sūtīt un saņemt pastu"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Atcelt Visu"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
 msgstr "Atjauninu..."
 
-#: 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 "Gaidu..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "_Atcerēties šo paroli"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nevarēju saglabāt paraksta failu: %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"
@@ -15446,23 +15580,23 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
 msgid "Save signature"
 msgstr "Saglabāt parakstu"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
 msgid "Edit signature"
 msgstr "Rediģēt parakstu"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Ievadiet nosaukumu šim parakstam."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
 msgid "Name:"
 msgstr "Nosaukums:"
 
@@ -15492,17 +15626,17 @@ msgstr "Pārsūtīta vēstule"
 msgid "Invalid folder: `%s'"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Uzstādu vmapi: %s"
 
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atjauninu vmapes priekš uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15515,84 +15649,84 @@ msgstr ""
 "    '%s'\n"
 "Un tagad tiek atjauninātas."
 
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mēģinājums rediģēt vmapi '%s', kur īstenībā neeksistē"
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas neredzētas vēstules"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
 msgstr "Vairākas vēstules"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
 msgstr "Augstākais"
 
-#: 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 "Šodien %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardien %I:%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 "%b %d %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Izveidoju vēstuļu sarakstu"
 
@@ -15640,7 +15774,7 @@ msgstr "Sekojums"
 msgid "For Your Information"
 msgstr "Jūsu zināšanai (For Your Information)"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Pārsūtīt"
 
@@ -15648,11 +15782,11 @@ msgstr "Pārsūtīt"
 msgid "No Response Necessary"
 msgstr "Nav nepieciešama atbilde (No Response Necessary)"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atbildēt"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Atbildēt Visiem"
 
@@ -15677,7 +15811,8 @@ msgstr ""
 "Lūdzu izvēlieties sekojuma darbību zem \"Karogs\" izvēlnes."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Līdz:"
 
 #: mail/message-tags.glade.h:7
@@ -15903,7 +16038,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Atcelt sanāksmi šim priekšmetam"
 
-#: 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 "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
@@ -15928,26 +16063,26 @@ msgstr ""
 msgid "Select importer"
 msgstr "Izvēlēties mapi"
 
-#: 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 "Fails %s neeksistē"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
 msgstr "Importējam"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importējam"
 
-#: 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 "Kļūda ielādējot %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15956,35 +16091,35 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
 #, fuzzy
 msgid "_Filename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 #, fuzzy
 msgid "File _type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importēt vienu failu"
 
-#: 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"
@@ -15992,26 +16127,26 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Meklējam eksistējošus uzstādijumus"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
 msgstr "Startēju inteliģentos importētājus"
 
-#: 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 "No %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Nav pieejams piegādātajs protokolam '%s'"
 
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Neizdevās palaist gpg."
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 #, fuzzy
 msgid "_Import"
 msgstr "Importēt"
@@ -16020,7 +16155,7 @@ msgstr "Importēt"
 msgid "Closing connections..."
 msgstr "Aizvērt savienojumus..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution Uzstādījumi"
 
@@ -16055,11 +16190,11 @@ msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 msgid "Cannot find the specified shared folder."
 msgstr "Nevar atrast norādīto koplietošanas mapi."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
 msgstr "Sākam importu"
 
-#: 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 "
@@ -16068,11 +16203,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Asistents"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nav norādīts mapes nosaukums."
@@ -16117,15 +16247,15 @@ msgstr "Bug buddy nevar tikt palaists."
 msgid "About Ximian Evolution"
 msgstr "Par Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Strādāt nesaistē"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Strādāt nesaistē"
 
@@ -16177,7 +16307,6 @@ msgstr "Izvēles rūtiņa"
 
 #: 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 "Jauna"
 
@@ -16235,18 +16364,19 @@ msgstr "Ievietot jaunu uzdevumu"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Active Connections"
+msgid "<b>Active Connections</b>"
 msgstr "Aktīvie savienojumi"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Aktīvie savienojumi"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klikšķiniet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīmā"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Pašreizējie aktīvie savienojumi ir:"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "K_alendārs:"
@@ -16371,28 +16501,28 @@ msgstr ""
 "Ar asistentu jūs tiksiet vadīts cauri\n"
 "ārējo failu importēšanas procesam Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importeri"
 
-#: 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ēt"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Neimportēt"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Neprasiet man vēlreiz"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16427,7 +16557,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"
@@ -16435,49 +16565,49 @@ msgstr ""
 "Paldies\n"
 "Ximian Evolution Komanda\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nesakiet man vēlreiz"
 
-#: shell/main.c:381
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nevar atvērt Ximian Evolution čaulu."
 
-#: shell/main.c:390
+#: shell/main.c:401
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nevaru inicializēt Ximian Evolution čaulu: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
 msgstr "Startēt nesaistes režīmā"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
 msgstr "Startēt tiešsaistes režīmā"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:509
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forsēt konfigurācijas failu atjaunināšanu no Evolution versijas 1.0.x"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
 msgstr "Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
 
-#: 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"
@@ -16486,50 +16616,61 @@ msgstr ""
 "%s: --online un --offline nevar tikt lietoti kopā.\n"
 "  Izmantojiet %s --help, lai iegūtu vairāk informācijas.\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
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Izvēlēties mapi"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 #, fuzzy
 msgid "Purposes"
 msgstr "Progress"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 #, fuzzy
 msgid "Expires"
 msgstr "Izteiksme"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Epasta adrese:"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Sertifikāta der. laiks iztecējis: %s\n"
 "Izsniedzējs: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Ievadiet %s paroli"
 
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Ievadiet %s paroli"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Ievadiet paroli"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, c-format
@@ -16735,7 +16876,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kartes ID jau eksistē"
@@ -17041,7 +17183,7 @@ msgstr "Pārvietot kontaktus uz citu mapi..."
 msgid "Move to Folder..."
 msgstr "Pārvietot uz mapi..."
 
-#: 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 "Ievietot starpliktuves saturu"
 
@@ -17050,8 +17192,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Apskatīt drukājamos kontaktus"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Drukāšanas _pirmsapskats"
 
@@ -17100,13 +17242,13 @@ msgstr "Apturēt Ielādi"
 msgid "View the current contact"
 msgstr "Parādīt pašreizējo kontaktu"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Darbības"
 
@@ -17127,14 +17269,10 @@ msgid "_Save as VCard"
 msgstr "_Saglabāt kā Vkarti"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Meklēt kontaktus"
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "_Izvēlēties visu"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Sūtīt vēstuli kontaktam..."
 
@@ -17142,62 +17280,58 @@ msgstr "_Sūtīt vēstuli kontaktam..."
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "reizes"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Dzēst šo tikšanos"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Dzēst šo priekšmetu"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Dzēst šo mapi"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Iet Uz "
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Iet atpakaļ"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Iet uz priekšu"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Iet uz _Datumu"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Iet uz norādīto datumu"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Iet uz šodienu"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mēnesis"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Nākošā"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Parāda kalendāru, kāds tas tiks drukāts"
 
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Iepriekšējā"
+
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Drukāt šo kalendāru"
@@ -17206,7 +17340,7 @@ msgstr "Drukāt šo kalendāru"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicēt Brīvs/Aizņemts informāciju šim kalendāram"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
@@ -17218,35 +17352,55 @@ msgstr "Publiska mape, kas satur tikšanos un notikumu ierakstus"
 
 #: ui/evolution-calendar.xml.h:25
 #, fuzzy
+msgid "Select _Date"
+msgstr "Izvēleties Vārdu"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Iet uz norādīto datumu"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Izvēlieties mapi"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show as list"
 msgstr "Parādīt detaļas"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Parādīt vienu dienu"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Parādīt vienu mēnesi"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Parādīt vienu nedēļu"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Parādīt darba nedēļu"
 
-#: 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 "Šodien"
+
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "View the current appointment"
 msgstr "Parādīt pašreizējo kontaktu"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Nedēļa"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Tikšanās"
@@ -17521,7 +17675,7 @@ msgstr "Atzīmēt _visas kā lasītas"
 msgid "Mark all visible messages as read"
 msgstr "Atzīmēt visas redzamās vēstules kā lasītas"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Izlikt vēstuli(es) no starpliktuves"
 
@@ -17692,312 +17846,314 @@ msgid "F_orward As..."
 msgstr "Pā_rsūtīt"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Filtra noteikumi"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrs uz pas_ta saraksti..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtrs _uz sūtītāju..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtrs uz _adresātiem..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtrs uz _subjektu..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Atzīmēt izvēlētās vēstules kā nesvarīgas"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Karogot izvēlētās vēstules sekojumam"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Se_kojums..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Piespiest ielādēt attēlus HTML pastā"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Pārsūtīt izvēlēto vēstuli jaunas vēstules ķermenī"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Pārsūtīt izvēlēto vēstuli citētu kā atbildi"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Pārsūtīt izvēlēto vēstuli kādam"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Pārsūtīt izvēlēto vēstuli kādam kā piesaistni"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Palielināt teksta izmēru"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "_Ielādēt attēlus"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Iezīmēt kā svarīgas"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Atzīmēt kā _neizlasītas"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Iezīmēt _kā nesvarīgas"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Atzīmēt izvēlētās vēstules kā lasītas"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Atzīmēt izvēlētās vēstules kā svarīgas"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Atzīmēt izvēlētās vēstules kā nesvarīgas"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Atzīmēt izvēlētās vēstules kā nelasītas"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Atzīmēt izvēlētās vēstules kā nelasītas"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Atzīmēt izvēlētās vēstules kā nesvarīgas"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Atzīmēt izvēlētās vēstules dzēšanai"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Pārvietot"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Pārvietot izvēlētās vēstules uz citu mapi"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "Nākošā"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Nākošā _svarīgā vēstule"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Nākošais _pavediens"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Nākošā _neizlasītā vēstule"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
 msgstr "Nav atrasts"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Atvērt izvēlēto vēstuli jaunā logā"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Atvērt norādīto vēstuli sacerētājā, lai to pārsūtītu"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Oriģinālais I_zmērs"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "Iep_riekšējā neizlasītā vēstule"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Publicēt atbildi"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publicēt atbildi uz vēstuli publiskajā mapē"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "I_epriekšējā svarīgā vēstule"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Apskatīt vēstuli pirms drukāšanas"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "Iepriekšējā"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Drukāt šo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Pāra_dresēt"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Pāradresēt izvēlēto vēstuli kādam"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Atsaukt tekstu oriģinālajā izmērā"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "M_eklēt vēstuli..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Mazāks"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Saglabāt vēstuli kā teksta failu"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Uzstādīt lapas uzstādijumus jūsu pašreizējam printerim"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Parādīt epasta _avotu"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Parādīt _pilnas galvenes"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Parādīt vēstuli normālā stilā"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Parādīt vēstuli ar visiem epasta galvenēm"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Parādīt vēstules pamata epasta avotu "
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Teksta _izmērs"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Atdzēst izvēlētās vēstules"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VMape uz pasta _saraksti..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VMape uz sū_tītāju..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VMape uz saņē_mējiem..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VMape pēc _subjekta..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Piesaistīt"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopēt uz mapi"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Izveidot filtru no vēstules"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
 msgstr "_Ej uz "
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
 msgstr "_Iekļaut"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
 msgstr "_Lielāks"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
 msgstr "_Vēstules attēlošana"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz mapi"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Nākošā vēstule"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
 msgstr "_Normāla attēlošana"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
 msgstr "_Atvērt vēstuli"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Iepriekšējā vēstule"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Citēts"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
 msgstr "_Pārsūtīt..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Rīki"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_Atdzēst"
 
@@ -18267,41 +18423,41 @@ msgstr "Kopēt izvēlēto uzdevumu"
 msgid "Cut selected task"
 msgstr "Izgriezt izvēlēto uzdevumu"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Dzēst izpildītos uzdevumus"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Dzēst izvēlētos uzdevumus"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "A_tzīmēt kā izpildītus"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Mark selected tasks as complete"
 msgstr "A_tzīmēt izvēlētos uzdevumus kā izpildītus"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Ievietot uzdevumu no starpliktuves"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Apskata drukājamo uzdevumu sarakstu"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Drukāt uzdevumu sarakstu"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "View the selected task"
 msgstr "Dzēst izvēlētos uzdevumus"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 #, fuzzy
 msgid "_Open Task"
 msgstr "_Uzdevums"
@@ -18435,10 +18591,15 @@ msgid "_Day View"
 msgstr "_Dienas skats"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Skats pēc izvēles"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Mēneša skats"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Darba _nedēļas skats"
 
@@ -18473,10 +18634,16 @@ msgid "_Messages"
 msgstr "Vēstules"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Ar _kategoriju"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Datuma laikā:"
 
 #: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Uzstādīt statusu"
+
+#: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Uzdevumi"
 
@@ -18539,14 +18706,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 "Tagad"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Šodien"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -18556,82 +18719,87 @@ msgstr "Laikam jābūt šādā formātā: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentu vērtībai jābūt starp 0 un 100, ieskaitot"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Baltic"
 msgstr "Baltijas"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Central European"
 msgstr "Centrāleiropas"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Chinese"
 msgstr "Ķīniešu"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Cyrillic"
 msgstr "Kirlicas"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Greek"
 msgstr "Grieķu"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Hebrew"
 msgstr "Ebreju"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Japanese"
 msgstr "Japāņu"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Korean"
 msgstr "Korejiešu"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Turkish"
 msgstr "Turku"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Unicode"
 msgstr "Unikodes"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Western European"
 msgstr "Rietumeiropas"
 
-#: 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 "Rietumeiropas"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 msgid "Traditional"
 msgstr "Tradicionālā"
 
-#: 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 "Vienkāršā"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
 msgid "Ukrainian"
 msgstr "Ukraiņu"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
 msgid "Visual"
 msgstr "Vizuāls"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nezināma rakstzīmju kopa: %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 "Rakstzīmju šifrēšana"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
 msgid "Enter the character set to use"
 msgstr "Ievadiet kādu rakstzīmju kopu lietot"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
 msgid "Other..."
 msgstr "Cita..."
 
@@ -18699,11 +18867,16 @@ msgid "Spacing around expander arrow"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Meklēt"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Meklēšanas redaktors"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Saglabāt meklēšanu"
 
@@ -18724,15 +18897,15 @@ msgstr "_Paplašināti..."
 msgid "Choose Image"
 msgstr "Izvēlieties failu"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Meklēt"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_Meklēt Tagad"
 
-#: 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 "_Tīrs"
 
@@ -18764,6 +18937,354 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Adrešu grāmatas avoti..."
+
+#~ msgid "Selected:"
+#~ msgstr "Izvēlētais:"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Kontakts"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "un %d citas kartes."
+
+#, fuzzy
+#~ msgid "Send an Email"
+#~ msgstr "Sūtīt epastu"
+
+#~ msgid "1 day"
+#~ msgstr "1 diena"
+
+#~ msgid "1 week"
+#~ msgstr "1 nedēļa"
+
+#~ msgid "1 hour"
+#~ msgstr "1 stunda"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minūte"
+
+#~ msgid "1 second"
+#~ msgstr "1 sekunde"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Apraksts:"
+
+#, fuzzy
+#~ msgid "component"
+#~ msgstr "Tikšanās"
+
+#~ msgid "Alarms"
+#~ msgstr "Trauksmes"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Ģeogrāfiskā pozīcija"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Katras %d dienas"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Katras %d nedēļas"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Katras %d nedēļas "
+
+#~ msgid "every %d months"
+#~ msgstr "katrus %d mēnešus"
+
+#~ msgid "Every %d years"
+#~ msgstr "Katrus %d gadus"
+
+#~ msgid "Go To Date"
+#~ msgstr "Ej Uz Datumu"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "Ej Uz Šodien"
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Servera nosaukums"
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "_Meklēšanas bāze:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "STARTTLS pieprasījums iztecējis: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "STARTTLS atbildes kļūda"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "HELO pieprasījums iztecējis: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "HELO atbildes kļūda"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH pieprasījums iztecējis: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH pieprasījums neveiksmīgs."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM atbildes kļūda"
+
+#~ msgid "RCPT TO request timed out: %s: mail not sent"
+#~ msgstr "RCPT TO pieprasījums iztecējis: %s: pasts nav nosūtīts"
+
+#~ msgid "DATA request timed out: %s: mail not sent"
+#~ msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
+
+#~ msgid "DATA response error"
+#~ msgstr "DATA atbildes kļūda"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "DATA sūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA pārtraukuma atbildes kļūda"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "RSET pieprasījums iztecējis: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "RSET atbildes kļūda"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "QUIT pieprasījums iztecējis: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "QUIT atbildes kļūda"
+
+#, fuzzy
+#~ msgid "%d seconds ago"
+#~ msgstr "%d sekundes"
+
+#, fuzzy
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minūtes"
+
+#, fuzzy
+#~ msgid "%d hours ago"
+#~ msgstr "%d stundas"
+
+#, fuzzy
+#~ msgid "%d days ago"
+#~ msgstr "%d %s atpakaļ"
+
+#, fuzzy
+#~ msgid "%d weeks ago"
+#~ msgstr "%d nedēļas"
+
+#, fuzzy
+#~ msgid "%d months ago"
+#~ msgstr "%d %s atpakaļ"
+
+#, fuzzy
+#~ msgid "%d years ago"
+#~ msgstr "%d %s atpakaļ"
+
+#~ msgid "Then"
+#~ msgstr "Tad"
+
+#~ msgid "If"
+#~ msgstr "Ja"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Rediģēt filtrus"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Rediģēt vMapes"
+
+#~ msgid "Outgoing"
+#~ msgstr "Izejošais"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Kanālot vēstuli uz čaulas komandu"
+
+#~ msgid "Shell Command"
+#~ msgstr "Čaulas komanda"
+
+#~ msgid "Rules"
+#~ msgstr "Noteikumi"
+
+#, fuzzy
+#~ msgid "[script]"
+#~ msgstr " [skripts]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Pievienot skripta parakstu"
+
+#~ msgid "Current store format:"
+#~ msgstr "Pašreizējais glabātuves formāts:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Indeksa ķermenis satur"
+
+#~ msgid "New store format:"
+#~ msgstr "Jauns glabātuves formāts:"
+
+#~ 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 ""
+#~ "Piezīme: Kad notiek konvertēšana starp pastkašu formātiem, neizdošanās\n"
+#~ "(piemēram, diska vietas trūkuma gadījumā) var nebūt automātiski\n"
+#~ "atsaucama. Lūdzu izmantojiet šo darbību rūpīgi."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontu informācija"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentifikācija"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Sacerēt vēstules"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigurācija"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Noklusētā uzvedība"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Pasta dzēšana"
+
+#, fuzzy
+#~ msgid "Filter Options"
+#~ msgstr "<< Mazāk opcijas"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Iezīmes un krāsas"
+
+#~ msgid "Loading Images"
+#~ msgstr "Ielādēju attēlus"
+
+#~ msgid "Message Display"
+#~ msgstr "Vēstules attēlošana"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "Vēstule satur"
+
+#~ msgid "Optional Information"
+#~ msgstr "Optionāla informācija"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Drukātie fonti"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Atc_erēties šo paroli"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Atcerēties šo _paroli"
+
+#~ msgid "Required Information"
+#~ msgstr "Pieprasītā informācija"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Atjaunot noklusējumus"
+
+#~ msgid "S_ecurity"
+#~ msgstr "_Drošība"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Drošais MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Servera konfigurācija"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Autentifikācijas tips:"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Autentifikācijas tips:"
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Noklusētais paraksts:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Pilns vārds:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identitāte"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "Jūnijs"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Saņemot pastu"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Atjaunot noklusējumus"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Sūtot pastu"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Sūtu \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Kļūda pie %d vēstules no %d"
+
+#~ msgid "Search"
+#~ msgstr "Meklēšana"
+
+#, fuzzy
+#~ msgid "Digital Signature"
+#~ msgstr "Rediģēt parakstu"
+
+#, fuzzy
+#~ msgid "Encryption"
+#~ msgstr "Izņēmumi"
+
+#, fuzzy
+#~ msgid "Quit Assistant"
+#~ msgstr "Asistents"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Pašreizējie aktīvie savienojumi ir:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Meklēt kontaktus"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Iet uz _Datumu"
+
+#~ msgid "Go to today"
+#~ msgstr "Iet uz šodienu"
+
+#~ msgid "With _Category"
+#~ msgstr "Ar _kategoriju"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Adrešu grāmatas resursi"
 
@@ -19119,9 +19640,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "LDAP serveris"
 
-#~ msgid "Select Names"
-#~ msgstr "Izvēleties Vārdu"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Izvēlētie kontakti:"
 
@@ -19158,10 +19676,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Kalendāra informācija"
 
 #, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Ziņa, ko attēlot"
-
-#, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Sākas:</b> "
 
@@ -19178,10 +19692,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Kalendāra informācija"
 
 #, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Līdz:</b>"
-
-#, fuzzy
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "Darba nedēļa"
 
@@ -19218,10 +19728,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Nevar izveidot direktoriju %s: %s"
 
 #, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Pirmsapskats"
-
-#, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "Progress"
 
@@ -19526,9 +20032,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "New _Task"
 #~ msgstr "Jauns uzdevums"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "Evolution _logs"
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Evolution _logs"
@@ -19937,9 +20440,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "No cards"
 #~ msgstr "Nav karšu"
 
-#~ msgid "1 card"
-#~ msgstr "1 karte"
-
 #~ msgid "%d cards"
 #~ msgstr "%d kartes"
 
@@ -20010,9 +20510,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "_Save as..."
 #~ msgstr "Saglabāt _kā..."
 
-#~ msgid "End Date"
-#~ msgstr "Beigu datums"
-
 #~ msgid "Print..."
 #~ msgstr "Drukāt..."
 
@@ -20046,9 +20543,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Failed to find a common bulk algorithm."
 #~ msgstr "Neizdevās atrast parasto bulk algoritmu."
 
-#~ msgid "Failed to decode message."
-#~ msgstr "Neizdevās atkodēt vēstuli."
-
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Nevarēju izveidot PGP paraksta kontekstu"
 
@@ -20283,9 +20777,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "However, the message was successfully sent."
 #~ msgstr "Kaut arī, vēstule tika veiksmīgi nosūtīta."
 
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Nenosaukta vēstule)"
-
 #~ msgid "Empty Message"
 #~ msgstr "Tukša vēstule"
 
@@ -28535,12 +29026,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "News Feeds"
 #~ msgstr "_Ziņu Barotnes"
 
-#~ msgid "One mont_h"
-#~ msgstr "Viens _mēnesis"
-
-#~ msgid "One w_eek"
-#~ msgstr "Viena n_edēļa"
-
 #~ msgid "R_efresh time (seconds):"
 #~ msgstr "Atjaunināšanas _laiks (sekundēs):"
 
@@ -28560,9 +29045,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Parādīt temeratūru:"
 
-#~ msgid "Tasks "
-#~ msgstr "Uzdevumi "
-
 #~ msgid "Weather Settings"
 #~ msgstr "Laikapstākļu uztādījumi"
 
@@ -28584,9 +29066,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "_New Feed"
 #~ msgstr "_Ziņu Barotnes"
 
-#~ msgid "_One day"
-#~ msgstr "_Viena diena"
-
 #, fuzzy
 #~ msgid "_Show full path for folders"
 #~ msgstr "Parādīt pilnu ceļu mapēm"
@@ -29745,15 +30224,9 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Same as text"
 #~ msgstr "Tāpat kā tekstu"
 
-#~ msgid "Select a signature script"
-#~ msgstr "Izvēlieties paraksta skriptu"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML paraksts:"
 
-#~ msgid "_Language:"
-#~ msgstr "_Valoda:"
-
 #~ msgid "_Random"
 #~ msgstr "_Gadījuma"
 
@@ -30122,15 +30595,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Nevarēju sameklēt sūtītāja adresi ('From') vēstulē"
 
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "Nevaru nosūtīt vēstuli: nav noteikta sūtītāja adrese."
-
-#~ msgid "RCPT TO response error: %s: mail not sent"
-#~ msgstr "RCPT TO atbildes kļūda: %s: pasts nav nosūtīts"
-
-#~ msgid "DATA response error: %s: mail not sent"
-#~ msgstr "DATA atbildes kļūda: %s: pasts nav nosūtīts"
-
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr "DATA atbildes kļūda: vēstules pārtraukšana: %s: pasts nav nosūtīts"
 
diff --git a/po/mn.po b/po/mn.po
index 886b255a83..7ed112eead 100755
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
 "PO-Revision-Date: 2004-01-14 12:40+0800\n"
 "Last-Translator: Dulmandakh <sdulmandakh@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-gnome@lists.sf.net>\n"
@@ -15,6 +15,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \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 "Эвелюшин хаягийн дэвтэр"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Эволюшин хаягийн дэвтрийн хавтас үзүүлэгч"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Нэрээр хадгалах"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "картууд"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "картууд"
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Эволюшин сэрүүлэг"
+
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -92,76 +132,92 @@ msgstr ""
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "New Address Book"
 msgstr "Шинэ хаягийн дэвтэр"
 
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Устгах"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Шинжүүд:"
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
 msgstr "Шинэ холбоо"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
 msgstr "_Холбоо"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
 msgstr "Шинэ холбоо үүсгэх"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
 msgstr "Шинэ холбооны жагсаалт"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
 msgstr "Холбооны жагсаалт"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
 msgstr "Шинэ холбооны жагсаалт үүсгэх"
 
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Шинэ хаягийн дэвтэр"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Хаягийн дэвтэр"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Хаягийн дэвтэрт хадгалах"
+
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP  серверт холбогдож чадсангүй"
 
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP серверээр баталгаажуулж чадсангүй"
 
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -186,17 +242,17 @@ msgstr ""
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Энэ компьютер дээр"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Хувийн"
 
@@ -243,7 +299,7 @@ msgstr ""
 msgid "This query did not complete successfully."
 msgstr "Энэ хүсэлт амжилттай дууссангүй."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -252,20 +308,20 @@ msgstr ""
 "Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
 " болон хандах эрхээ шалгана уу."
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -274,28 +330,28 @@ msgstr ""
 "Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
 " болон хандах эрхээ шалгана уу."
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
 msgstr "Хаягийн дэвтрийг нээх боломжгүй"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
 
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
 msgstr "Баталгаажуулалт хийж чадсангүй.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s-н нууц үгийг оруулах (%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 ""
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
 msgstr ""
 
@@ -318,16 +374,10 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -342,62 +392,53 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "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
 #, fuzzy
 msgid "Address Book Creation Assistant"
 msgstr "Хаягийн дэвтэр үүсгэгч туслах"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Хаягийн дэвтэр..."
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Үргэлж"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Anonymously"
 msgstr "Хэн нэгэнээр"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, you are\n"
@@ -410,50 +451,50 @@ msgstr ""
 "Та энд оруулсан тохируулгуудаа хадгалахын тулд \"Дуусга\" товч дээр товшино "
 "уу."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Connecting"
 msgstr "Холбогдож байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Email address:"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Коста Рика"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Дууссан"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ерөнхий"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Бүлэг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Хэзээ ч"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -463,30 +504,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "One"
 msgstr "Нэг"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "S_earch scope: "
 msgstr "Хайх _хүрээ"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Searching"
 msgstr "Хайж байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Тэмдэглэгдсэн:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -497,7 +534,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -506,7 +543,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -514,7 +551,7 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "Specifying a\n"
@@ -524,32 +561,32 @@ msgstr ""
 "Дүрслэх нэр болон бүлгийг тодорхойлох нь хаягийн дэвтрийн тохиргооны эхний "
 "алхам юм."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "1-р алхам: Хавтасны үзүүлэлтүүд "
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "Step 2: Server Information"
 msgstr "2-р алхам: Серверийн мэдээлэл"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 3: Connecting to Server"
 msgstr "3-р алхам: Серверт холбогдох"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 4: Searching the Directory"
 msgstr "4-р алхам: Хавтсыг хайх"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Дэд"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Дэмжигдсэн хайлтын сууриуд"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -558,7 +595,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -566,7 +603,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -576,7 +613,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -586,41 +623,41 @@ msgid ""
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -628,28 +665,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS ашиглах:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using email address"
 msgstr "Ц-шуудангийн хаяг ашиглан"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Хэзээ ч боломжтой"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -657,60 +694,48 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Харуулах нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Download limit:"
 msgstr "_Татаж авах хязгаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "_Засварлах"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
 msgstr "_Нэвтрэх арга:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Port number:"
 msgstr "_Портын дугаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Search base:"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Серверийн нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "cards"
 msgstr "картууд"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "searching-tab"
 msgstr ""
 
@@ -742,7 +767,7 @@ msgid "Send HTML Mail?"
 msgstr "ХТМЛ захиадал илгээх үү?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr "Холбоонуудад нэмэх"
 
@@ -758,7 +783,7 @@ msgstr "Нэр"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Эх үүсвэр"
 
@@ -830,7 +855,8 @@ msgstr "Хамтын ажиллагаа"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
 msgstr "Холбооны засварлагч"
 
@@ -839,7 +865,7 @@ msgid "D_epartment:"
 msgstr "Хэлтэс:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэлгэрэнгүй"
@@ -920,16 +946,27 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Устгах"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Засварлах"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home:"
 msgstr "_Гэр"
@@ -971,22 +1008,22 @@ msgid "_Web page address:"
 msgstr "_Вэб хуудасны хаяг:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Хаяг"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
 msgstr "Засварлагдах"
 
@@ -1974,9 +2011,9 @@ msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
 msgstr ""
 
@@ -1990,21 +2027,22 @@ msgid "MSN Messenger"
 msgstr "_Дараагийн зурвас"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Эх үүсвэр"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
 msgstr "Байршил:"
@@ -2015,109 +2053,97 @@ msgid "Username"
 msgstr "Шинээр нэрлэх"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
 msgstr "Гэрийн"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Ажилын"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
 msgstr "Бусад"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Эх дэвтэр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Холбоо"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Өөрчлөгдсөн"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 #, fuzzy
 msgid "Account Name"
 msgstr "_Данс:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
 msgstr "Бизнес"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 #, fuzzy
 msgid "GroupWise"
 msgstr "Бүлэг"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2131,6 +2157,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Бүтэн нэр:"
 
@@ -2138,6 +2165,18 @@ msgstr "_Бүтэн нэр:"
 msgid "E-_mail:"
 msgstr "_Ц-шуудан:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Хаяг _2:"
@@ -2241,23 +2280,28 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
+msgid "Add IM Account"
 msgstr "_Данс:"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
-msgid "Add IM Account"
+msgid "_Account name:"
 msgstr "_Данс:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
-msgstr ""
+#, fuzzy
+msgid "_IM Service:"
+msgstr "Эх үүсвэр"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
 msgstr "Байршил:"
 
+#: 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 "Гишүүд"
@@ -2278,25 +2322,26 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "Дэвтэр"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "Шинэ жагсаалт"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2344,23 +2389,21 @@ msgid "No contacts"
 msgstr "Холбоо алга"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 холбоо"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d холбоонууд"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d холбоонууд"
+msgstr[1] "%d холбоонууд"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "Хүсэлт"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr ""
 
@@ -2372,133 +2415,132 @@ msgstr "Загвар"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
 msgstr "Нэрний эхний үсэг"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
 msgstr "Ц-шуудангийн эхний үсэг"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Төрөл"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 #, fuzzy
 msgid "Address Book"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
 msgstr "Шинэ холбоо..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
 msgstr "Шинэ холбооны жагсаалт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
 msgstr "Хавтас руу оч..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
 msgstr "Оруулах..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Хэвлэх"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Хайчлах"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Хуулах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Буулгах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Одоогийн үзэмж"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2507,7 +2549,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
@@ -2541,8 +2583,6 @@ msgid "Car Phone"
 msgstr "Машины утас"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
@@ -2551,7 +2591,7 @@ msgid "Company Phone"
 msgstr "Компанийн утас"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Ц-шуудан"
 
@@ -2602,6 +2642,7 @@ msgid "Manager"
 msgstr "Зохион байгуулагч"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
 msgstr "Гар утас"
 
@@ -2610,7 +2651,7 @@ msgid "Nickname"
 msgstr "Хоч"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Тэмдэглэл"
 
@@ -2619,7 +2660,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Байгууллага"
 
@@ -2675,17 +2716,17 @@ msgid "Web Site"
 msgstr "Вэб сайт"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
 msgstr "Өргөн"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
 msgstr "Өндөр"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
 msgstr ""
 
@@ -2729,88 +2770,91 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
 msgstr "Тэмдэглэгдсэн"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
 msgstr "Курсортой"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
 msgstr "Гишүүдийг жагсаах"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
 msgstr "Ц-шуудан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Ажилын"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
 msgstr "Тайлбар"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 #, fuzzy
 msgid "Groupwise"
 msgstr "Бүлэг"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "Phone"
 msgstr "Машины утас"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Хувийн"
+msgid "work"
+msgstr "Ажилын"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "Хувийн"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
 msgstr "Албан тушаал"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
 msgstr "Вэб хуудас"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Амжилттай"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
@@ -2818,150 +2862,150 @@ msgstr "Амжилттай"
 msgid "Unknown error"
 msgstr "Үл мэдэгдэх алдаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Зөвшөөрөгдөөгүй"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Холбоо олдсонгүй"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Баталгаажуулж чадсангүй"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Баталгаажуулах хэрэгтэй"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Бусад алдаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Жагсаалтыг нэмэхэд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "Холбоо нэмэхэд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Жагсаалтыг өөрчлөхөд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Жагсаалтыг устгахад алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "Холбоог устгахад алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Дарж бичих"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "жагсаах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Холбоог зөөх"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Холбоог хуулах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Холбоонуудыг зөөх"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Холбоонуудыг хуулах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Хаягийн дэвтэрт хадгалах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2998,33 +3042,31 @@ msgstr ""
 msgid "Querying Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Холбоо барих мэдээллийг засварлах"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Ц-шуудангийн хаягийг нийлүүлэх"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "болон бусад %d холбоонууд."
-
-#: 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 "болон бусад нэг холбоо."
+msgid_plural "and %d other contacts."
+msgstr[0] "болон бусад нэг холбоо."
+msgstr[1] "болон бусад нэг холбоо."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Хаягийн дэвтэрт хадгалах"
 
@@ -3175,7 +3217,7 @@ msgstr "Захын зайнууд"
 msgid "Number of columns:"
 msgstr "Багануудын тоо:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr ""
 
@@ -3352,7 +3394,7 @@ msgid "Unnamed List"
 msgstr "Нэр үгүй жагсаалт"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3429,7 +3471,7 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: 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"
@@ -3475,24 +3517,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Нээх"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Тайлбар алга."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3501,12 +3543,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3514,7 +3556,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3525,7 +3567,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3690,13 +3732,13 @@ msgstr "Тайлбарт агуулагдаж байна"
 msgid "Location contains"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Тохироогүй"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Хуанли"
 
@@ -3712,7 +3754,7 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
 msgstr "өдрүүд"
 
@@ -3723,7 +3765,7 @@ 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.
 #: 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"
 
@@ -3745,70 +3787,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/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
 msgstr "Шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
 msgstr "_Зориулалт"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
 msgstr "Шинэ зориулалт үүсгэх"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
 msgstr "Уул_залт"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
 msgstr "Шинэ уулзалтын хүсэлт үүсгэх"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
 msgstr "Бүтэн өдрийн шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
 msgstr "Бүтэн _өдрийн төлөвлөгөө"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
 msgstr "_Хуанли"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
 msgstr "Шинэ хуанли үүсгэх"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3838,10 +3880,6 @@ msgstr "Долоо хоногийн үзэмж"
 msgid "Month View"
 msgstr "Сарын  үзэмж"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Жагсаалтын үзэмж"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3859,16 +3897,16 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr ""
 
@@ -3934,11 +3972,11 @@ msgstr ""
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "цаг"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
 msgstr "минут"
 
@@ -3962,11 +4000,11 @@ msgstr "Энгийн"
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "Зурвас харуул"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Дуу тоглуул"
 
@@ -3975,17 +4013,17 @@ msgstr "Дуу тоглуул"
 msgid "Reminders"
 msgstr "Сануулагч"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Програм ажиллуул"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr "Ц-захиа илгээ"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Ц-захиа илгээх"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "Нийт:"
@@ -4016,7 +4054,7 @@ msgid "hour(s)"
 msgstr "цаг"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "минут"
 
@@ -4026,8 +4064,8 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
 msgid "Enabled"
 msgstr ""
 
@@ -4043,19 +4081,19 @@ msgstr "Бүү оруулж ир"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Disable"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
 msgid "Enable"
 msgstr ""
 
@@ -4079,7 +4117,7 @@ msgstr "30 минут"
 msgid "60 minutes"
 msgstr "60 минут"
 
-#: 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 ""
 
@@ -4104,7 +4142,7 @@ msgid "Days"
 msgstr "Өдөр"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
@@ -4201,7 +4239,7 @@ msgid "Wednesday"
 msgstr "Лхагва"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Ажлын долоо хоног"
 
@@ -4248,7 +4286,6 @@ msgid "_Fri"
 msgstr "_Баа"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Ерөнхий"
 
@@ -4349,7 +4386,7 @@ msgstr ""
 "уу."
 
 #: 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 ""
 
@@ -4499,28 +4536,28 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr "-д"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr "(Дууссан"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Дууссан"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr ""
 
@@ -4556,8 +4593,9 @@ msgstr ""
 msgid "No summary"
 msgstr "Дүгнэлт алга"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
 msgstr "Нэрээр хадгалах..."
 
@@ -4571,35 +4609,20 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 #, fuzzy
 msgid "Could not open destination"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Үйлдлээ тэмдэглэх"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Хуанли"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Үүргийн жагсаалтын нэр"
-
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4628,19 +4651,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+#, 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] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+#: 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] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+msgstr[1] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
author	JP Rosevear <jpr@ximian.com>	2004-04-03 00:33:55 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2004-04-03 00:33:55 +0800
commit	5748693354eb261e91fd9648a0ae6cdbbfdefbd9 (patch)
tree	3229ee1db67a670b275dd2043217fb1c809df88b /po
parent	8cc048dc72218fcd37c3a77297bf5a14bb7347bc (diff)
download	gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.gz gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.zst gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.zip