bump version

2004-05-19 JP Rosevear <jpr@novell.com> * configure.in: bump version svn path=/trunk/; revision=25982
author: JP Rosevear <jpr@novell.com> 2004-05-20 02:35:59 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2004-05-20 02:35:59 +0800
commit: c7dbb95e79df331a75d7ba49cedc1b8e816422cf (patch)
tree: f8c9851496db10145da1c5bd7e482dc3fd9e1c1d /po/gl.po
parent: a9b7ecefe5f6cce56289744e0b68679835634c02 (diff)
download: gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.gz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.zst
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.zip
1 files changed, 3928 insertions, 3189 deletions
diff --git a/po/gl.po b/po/gl.po
index 7dd8ee44b8..4fd703ee14 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\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"
@@ -28,6 +28,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Editar o Libro de Enderezos"
 
+#: 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"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -53,16 +63,6 @@ msgstr "Sen tarxetas"
 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:"
@@ -79,74 +79,24 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Data na que se completa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "ID do certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#. 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:373
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editar o Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+msgid "Failed to authenticate.\n"
 msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Introduza o seu contrasinal para %s"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -191,7 +141,11 @@ msgstr "Co_ntactos:"
 msgid "Create a new contacts group"
 msgstr "Crear un novo grupo de atallos"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -199,7 +153,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -207,39 +161,39 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 #, 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Agardando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Examinando %s"
@@ -247,8 +201,8 @@ msgstr "Examinando %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
@@ -256,7 +210,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
@@ -306,24 +260,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
+msgid "New Address Book"
+msgstr "Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Introduza o seu contrasinal para %s"
+#: addressbook/gui/component/addressbook-view.c:762
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: 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-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Propiedades..."
+
+#. 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/addressbook-view.c:1002
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contactos"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -343,6 +315,69 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Data na que se completa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID do certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -365,6 +400,7 @@ msgstr "Dete_ctar tipos soportados "
 #: calendar/gui/dialogs/url-editor-dialog.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 ""
@@ -440,7 +476,7 @@ msgstr "Co_ntactos:"
 msgid "Address Book Properties"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always"
@@ -457,119 +493,109 @@ msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "P_echar"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Cargar _Imaxes"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Único"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -580,7 +606,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -589,20 +615,20 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -610,7 +636,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -620,27 +646,27 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 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:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -650,7 +676,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -658,138 +684,145 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formato da hora:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Co_ntactos:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioridade:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Usar conexión segura (_SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eliminar Todos"
+msgid "Select Contacts from Address Book"
+msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eliminar"
 
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Eliminar Todos"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -814,23 +847,16 @@ msgstr "Engadir a Contactos"
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-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:222
 msgid "Source"
 msgstr "Fonte"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Seleccionar Contactos do Libro de Enderezos"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -903,60 +929,50 @@ msgid "<b>Work</b>"
 msgstr "Semana Laboral"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Enderezo _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ani_versario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "para sempre"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Axenda"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Compañía"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -964,43 +980,48 @@ msgstr "Compañía"
 msgid "Contact"
 msgstr "Contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_País:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL libre-ocupado"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "Full _Name..."
 msgstr "Nome _Completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "Fax Particular"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 #, fuzzy
 msgid "Location:"
@@ -1008,43 +1029,48 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Enviar _Mensaxe"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Xestor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Outro"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Apdo. de Correos:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1072,9 +1098,9 @@ msgstr "Páxina"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
@@ -1110,24 +1136,41 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: 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/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, fuzzy
 msgid "Address"
 msgstr "_Enderezo:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: 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:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #, fuzzy
 msgid "Editable"
 msgstr "Activado"
@@ -2114,105 +2157,123 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Anterior Mensaxe"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Engadir Servicio"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr ""
-"\n"
-"Localización Xeográfica: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nome de _Usuario:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
 #, fuzzy
 msgid "Yahoo"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Escolla unha das seguintes opcións"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Nome:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "As seguintes conexións están activas nestes intres:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Anterior Mensaxe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "Engadir Servicio"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "Location"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nome de _Usuario:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
@@ -2235,23 +2296,6 @@ 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:"
@@ -2408,8 +2452,8 @@ msgstr "editor-de-contactos"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Corpo"
@@ -2473,6 +2517,456 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Membros"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Estonia"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Nada"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Traballando"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "para sempre"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Teléfono Móbil"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Xeral"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Posto de traballo:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax Particular"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Éxito"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repositorio desconectado"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova Lista de Contactos"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Tarxeta non atopada"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "O ID da Tarxeta xa existe"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protocolo non soportado"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655 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"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "A autenticación fallou."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticación requirida"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Non existe a mensaxe"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Outro erro"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Non foi posible abrir este libro de enderezos.  Isto significa\n"
+"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
+"fóra de servicio"
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+msgstr ""
+"Esta versión de Evolution non ten soporte LDAP\n"
+"compilado nela. Se quere usar LDAP en Evolution\n"
+"debe compilar o programa desde as fontes do CVS\n"
+"logo de obter OpenLDAP desde o enlace de abaixo.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Non foi posible abrir este libro de enderezos.  Isto significa\n"
+"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
+"fóra de servicio"
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr "¿Quere gardar os cambios?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:208
+#, fuzzy
+msgid "_Discard"
+msgstr "Imprimir tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Erro ao engadi-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Erro ao engadi-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Erro ao modifica-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Erro ao modifica-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Erro ao elimina-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Erro ao elimina-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s xa existe\n"
+"¿Quere sobrescribilo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+#, fuzzy
+msgid "Overwrite"
+msgstr "¿Sobrescribir ficheiro?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, 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:437
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+#, fuzzy
+msgid "list"
+msgstr "Brétema"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Seleccionar Contactos do Libro de Enderezos"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Varias VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard de %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.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:199
+msgid "(none)"
+msgstr "(ningún)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Correo Electrónico Principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Correo Electrónico 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Correo Electrónico 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Escolla unha Acción"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un novo contacto \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Engadir un enderezo a un contacto existente \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Buscando no Libro de Enderezos..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Editar Información de Contacto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Mestura-lo Enderezo de Correo"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "non contén"
+msgstr[1] "non contén"
+
+#: 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:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Gardar como VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gardar no libro de enderezos"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2488,8 +2982,8 @@ msgstr[1] "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:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
 msgid "Query"
 msgstr "Alemaña"
@@ -2549,9 +3043,10 @@ msgstr "Libro de Enderezos"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Gardar como VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2625,7 +3120,7 @@ msgid "Cut"
 msgstr "Cortar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: calendar/gui/calendar-component.c:428 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
 msgid "Copy"
@@ -2636,18 +3131,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: 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/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -2661,7 +3146,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Calquera Categoría"
@@ -2702,21 +3187,6 @@ msgstr "Categorías"
 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:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Correo Electrónico 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 #, fuzzy
 msgid "Family Name"
@@ -2757,29 +3227,14 @@ msgstr "Xordania"
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Teléfono Móbil"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcume"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Nota"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organización"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
@@ -2833,23 +3288,33 @@ msgstr "Non vista"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Largura:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Altura:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Eliminada"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Ordeamento das tarefas"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -2868,11 +3333,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
-msgid "Column Width"
-msgstr "Colombia"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 #, fuzzy
 msgid ""
@@ -2906,432 +3366,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Andorra"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Eliminada"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Ordeamento das tarefas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Membros"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "Correo Electrónico"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Estonia"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Nada"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Traballando"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "para sempre"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Xeral"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Posto de traballo:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax Particular"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Éxito"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repositorio desconectado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "O cartafol `%s' non existe."
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nova Lista de Contactos"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Tarxeta non atopada"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "O ID da Tarxeta xa existe"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protocolo non soportado"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "A autenticación fallou."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Autenticación requirida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Non existe a mensaxe"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Outro erro"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Non foi posible abrir este libro de enderezos.  Isto significa\n"
-"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
-"fóra de servicio"
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-msgstr ""
-"Esta versión de Evolution non ten soporte LDAP\n"
-"compilado nela. Se quere usar LDAP en Evolution\n"
-"debe compilar o programa desde as fontes do CVS\n"
-"logo de obter OpenLDAP desde o enlace de abaixo.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Non foi posible abrir este libro de enderezos.  Isto significa\n"
-"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
-"fóra de servicio"
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "¿Quere gardar os cambios?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, fuzzy
-msgid "_Discard"
-msgstr "Imprimir tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Erro ao engadi-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Erro ao engadi-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Erro ao modifica-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Erro ao modifica-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Erro ao elimina-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Erro ao elimina-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s xa existe\n"
-"¿Quere sobrescribilo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-#, fuzzy
-msgid "Overwrite"
-msgstr "¿Sobrescribir ficheiro?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-#, fuzzy
-msgid "list"
-msgstr "Brétema"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Seleccionar Contactos do Libro de Enderezos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Varias VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard de %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.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(ningún)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Correo Electrónico Principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Escolla unha Acción"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear un novo contacto \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Engadir un enderezo a un contacto existente \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Buscando no Libro de Enderezos..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editar Información de Contacto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Mestura-lo Enderezo de Correo"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "non contén"
-msgstr[1] "non contén"
-
-#: 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:227
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 #, fuzzy
-msgid "Show Compact VCard"
-msgstr "Gardar como VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Gardar no libro de enderezos"
+msgid "Column Width"
+msgstr "Colombia"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3380,11 +3418,6 @@ msgstr "Compositor de correo de Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3396,6 +3429,11 @@ msgstr "Imprimi-los contactos seleccionados"
 msgid "Print contact"
 msgstr "Imprimi-los contactos seleccionados"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 ptos. Tahoma"
@@ -3582,18 +3620,6 @@ msgstr "Lista de _Contactos"
 msgid "This should test the contact print code"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-#, fuzzy
-msgid "Can not open file"
-msgstr "Non se pode abrir a mensaxe"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Tarxeta non atopada"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3652,6 +3678,18 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Outro erro"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#, fuzzy
+msgid "Can not open file"
+msgstr "Non se pode abrir a mensaxe"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Tarxeta non atopada"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -3667,12 +3705,13 @@ msgstr "Inserir Ficheiro"
 msgid "No filename provided."
 msgstr "Non se especificou un nome de cartafol"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Contrasinal"
@@ -3706,131 +3745,58 @@ msgstr "_Prioridade:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Compoñente do resumo executivo da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-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:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Fábica para o servicio de notificación de alarmas"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 #, fuzzy
 msgid "Starting:"
 msgstr "Opcións"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 #, fuzzy
 msgid "Ending:"
 msgstr "Í_ndice"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas"
 
 #: 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-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "P_echar"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "A_diar"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3839,12 +3805,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3852,7 +3818,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3863,20 +3829,21 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Fábica para o servicio de notificación de alarmas"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Non foi posible inicializar gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacións de alarma"
 
@@ -3991,61 +3958,46 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 #, fuzzy
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "_Pedir confirmación ao eliminar elementos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Pedir confirmación ao eliminar elementos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Borrar a tarefa seleccionada"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Amosa-los _números das semanas no navegador de datas"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "O resumo contén"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "O comentario contén"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Non concorda"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4057,130 +4009,141 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "é menor que"
 
-#: calendar/gui/calendar-commands.c:362
+#: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
 #: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 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:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
 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:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 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:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d de %B de %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.
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Propiedades..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Cargando axenda..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuración da Fonte de Novas"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
@@ -4210,16 +4173,37 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "O resumo contén"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "O comentario contén"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Non concorda"
+
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado"
@@ -4229,19 +4213,6 @@ msgstr "Permiso denegado"
 msgid "open_client(): %s"
 msgstr ""
 
-#: 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:194
-msgid "The URI that the calendar will display"
-msgstr "O URI que ha amosar a axenda"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opcións das Alarmas Sonoras"
@@ -4313,7 +4284,7 @@ msgstr "veces cada"
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4332,14 +4303,14 @@ msgstr "Básico"
 msgid "Date/Time:"
 msgstr "Data/Hora:"
 
-#: 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:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Tocar un son"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Reminders"
@@ -4355,6 +4326,7 @@ msgstr "Enviar unha mensaxe"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
 #: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
@@ -4393,10 +4365,110 @@ msgstr "minutos"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Nome do estilo:"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "O método requirido para cargar `%s' non está soportado"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+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
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Engadir á Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "P_echar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Escoller unha cor"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+#, fuzzy
+msgid "Remote"
+msgstr "Eliminar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "Task List Properties"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Engadir á Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Novo Grupo..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#, fuzzy
+msgid "_Refresh Interval:"
+msgstr "_Actualizar Lista "
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Actualizar Lista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+#, fuzzy
+msgid "_Source URL:"
+msgstr "URI da Fonte POP"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "semanas"
+
 #. 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:567 mail/em-account-prefs.c:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Activado"
 
@@ -4412,19 +4484,19 @@ msgstr "Non eliminar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Desactivar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Activado"
 
@@ -4450,167 +4522,179 @@ msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "Alerts"
-msgstr "Alarmas"
+msgid "<b>Alerts</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Recordatorios"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "información de axenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Semana Laboral"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias da Axenda e as Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Cor para tarefas retrasadas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Cor para tarefas para hoxe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Días"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Amosar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "Petición de Libre/Ocupado"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "S_un"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Amosa-los _números das semanas no navegador de datas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Tarefas para _hoxe:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Xoves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Hora"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Semana Laboral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Engadir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmación ao eliminar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Comprimi-las fins de semana na vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Day begins:"
 msgstr "_Amosar estacións:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Amosar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 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
@@ -4620,151 +4704,51 @@ msgstr "_Amosar"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Petición de Libre/Ocupado"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Xeral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Agocha-las tarefas completadas despois de"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tarefas _retrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Amosar os prazos _finais das citas nas vistas semanal e mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Di_visións horarias:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #, fuzzy
 msgid "_Tue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Mé_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Nome do estilo:"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "O método requirido para cargar `%s' non está soportado"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-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
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Engadir á Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Eliminar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Engadir á Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Novo Grupo..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "_Actualizar Lista "
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Actualizar Lista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URI da Fonte POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4839,81 +4823,81 @@ 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:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Erro descoñecido: %s"
-
-#: 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:2262
-msgid " (Completed "
-msgstr " (Completada "
-
-#: 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:2269
-msgid " (Due "
-msgstr " (Pendente "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Pendente "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Erro descoñecido: %s"
+
+#: 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:2262
+msgid " (Completed "
+msgstr " (Completada "
+
+#: 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:2269
+msgid " (Due "
+msgstr " (Pendente "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Pendente "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -5041,28 +5025,28 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Programar Xuntanza"
 
-#: 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:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Xuntanza"
 
@@ -5074,7 +5058,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data de _Inicio:"
@@ -5168,10 +5152,10 @@ 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:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5191,15 +5175,15 @@ msgstr "Debe estabrecerse un organizador."
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5494,26 +5478,19 @@ msgstr ""
 msgid "Save Event"
 msgstr "Mensaxe da Axenda"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, 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"
+msgid "Select destination"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Axenda"
+msgid "_Destination"
+msgstr "Borrar este cartafol"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Lista de _Tarefas"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5545,38 +5522,44 @@ msgid "% _Complete"
 msgstr "% Completo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
 #: 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:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -5614,11 +5597,11 @@ msgstr "Enderezo da páxina _Web:"
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non se pode abrir o libro de enderezos"
@@ -5627,8 +5610,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:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Descrición:"
@@ -5783,101 +5767,57 @@ msgstr "Servidor %s %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: 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:352
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privado"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidencial"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Prema para engadir unha tarefa"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data Final"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Sen título"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
 msgstr "Data de _Inicio:"
 
-#: 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-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Data Límite"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posición xeográfica ten que se introducir no formato: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+#, fuzzy
+msgid "Status:"
+msgstr "E_stado:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioridade:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 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"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Enderezo da páxina _Web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: 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:1674 camel/camel-gpg-context.c:1725
-#: 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:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Descoñecido"
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+msgid "Public"
+msgstr "Público"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Recorrendo"
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
+msgid "Private"
+msgstr "Privado"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Asignada"
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5924,18 +5864,27 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupado"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -5945,41 +5894,42 @@ msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
 #: 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-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
 #: 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:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
+#: mail/message-list.c:1644 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:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
 #: 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
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -6040,82 +5990,161 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de _Inicio:"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr "Resumo"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Seleccionar _Fío"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Eliminar..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_Copiar a un Cartafol..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover ó Cartafol.."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Preferencias de Correo..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Data Final"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "Data de _Inicio:"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
+#: 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:1703 camel/camel-gpg-context.c:1754
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recorrendo"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Asignada"
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: 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.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Non"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A posición xeográfica ten que se introducir no formato: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
 #: e-util/e-time-utils.c:393
@@ -6139,36 +6168,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisións de minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 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:698 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d de %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: 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:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisións de minuto"
 
 #: calendar/gui/e-itip-control.c:592
 #, fuzzy
@@ -6285,11 +6314,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:950
-#, fuzzy
-msgid "Status:"
-msgstr "E_stado:"
-
 #: calendar/gui/e-itip-control.c:955 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
@@ -6322,7 +6346,7 @@ msgstr "Actualización de Tarefa"
 #: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
 #: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
 #: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
@@ -6542,65 +6566,60 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-#, fuzzy
-msgid "Calendar file could not be updated!\n"
-msgstr "¡Non se puido envia-lo elemento!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 #, 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:1858
+#: calendar/gui/e-itip-control.c:1859
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 #, 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:1864
+#: calendar/gui/e-itip-control.c:1865
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -6718,28 +6737,6 @@ msgstr "Delegado"
 msgid "In Process"
 msgstr "En Progreso"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %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, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. 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
-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.
-#: 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
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
@@ -6800,84 +6797,171 @@ msgstr "Hora do _inicio da reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+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.
+#: calendar/gui/e-meeting-time-sel.c:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+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.
+#: 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Erro ao iniciar %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Non hai citas"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de Novas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Compoñente do resumo executivo da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Compositor de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarefa"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -7023,6 +7107,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Permiso denegado"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Non se pode abrir o libro de enderezos"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -7246,7 +7347,7 @@ msgid "Contacts: "
 msgstr "Co_ntactos:"
 
 #: 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:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
@@ -7258,69 +7359,79 @@ msgstr "Imprimir Elemento"
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "Non hai tarefas"
+msgstr[1] "Non hai tarefas"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d seleccionada(s)"
+msgstr[1] "%d seleccionada(s)"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Cargar _Imaxes"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "O URI do cartafol de tarefas a amosar"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Non foi posible cargar as tarefas en `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -7333,11 +7444,11 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarxetas"
@@ -9105,7 +9216,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Creando o cartafol %s"
@@ -9201,33 +9312,6 @@ msgstr "Argumentos non válidos"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Non se pode analizar a expresión de busca: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Erro ao executar a expresión de busca: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(coinciden-todas) require un único resultado booleano"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9266,7 +9350,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Non se pode analizar a expresión de busca: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro ao executar a expresión de busca: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(coinciden-todas) require un único resultado booleano"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:785
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(coinciden-todas) require un único resultado booleano"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(coinciden-todas) require un único resultado booleano"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9274,43 +9403,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9318,85 +9447,65 @@ msgid ""
 "%s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mensaxe cifrada"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Non se puido crear unha canalización de axuda ao bloqueo: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Non se pode lanza-lo axudante ao bloqueo: %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 "Non se puido bloquear '%s': erro de protocolo con lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Non se puido bloquear '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9419,6 +9528,26 @@ msgstr "Non se puido obter un bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non se puido obter un bloqueo usando flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Non se puido crear unha canalización de axuda ao bloqueo: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Non se pode lanza-lo axudante ao bloqueo: %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 "Non se puido bloquear '%s': erro de protocolo con lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Non se puido bloquear '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9666,7 +9795,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -9870,7 +9999,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "ID do certificado:"
 
 #: camel/camel-smime-context.c:360
@@ -9887,7 +10016,7 @@ msgstr "Non foi posible crear un contexto de descodificación S/MIME."
 msgid "Failed to add data to CMS encoder"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr ""
@@ -9963,99 +10092,99 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Ficheiro de sinatura:"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Engadir criterio"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tipo de Servidor: "
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Non se puido atopa-lo certificado de \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Non se puido atopar un algoritmo bulk común."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Non foi posible crear un contexto de descodificación S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Non se puido enviar o nome de usuario ao servidor"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Comando non implementado"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -10074,18 +10203,28 @@ msgstr "Non é posible obter o cartafol: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/camel-store.c:387 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:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -10218,7 +10357,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: 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:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10227,11 +10366,11 @@ 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:831
 msgid "GOOD"
 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:831
 msgid "BAD"
 msgstr ""
 
@@ -10253,7 +10392,7 @@ msgstr ""
 "¿Desexa aceptar de todas maneiras?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10268,28 +10407,28 @@ msgstr ""
 "\n"
 "¿Desexa aceptar de todas maneiras?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "ID do certificado:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10301,17 +10440,17 @@ msgstr "ID do certificado:"
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Erro ao iniciar %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
@@ -10323,11 +10462,6 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:390
-#, fuzzy, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Non foi posible renomear o cartafol: %s"
-
 #: camel/camel-vee-store.c:398
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10344,10 +10478,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
@@ -10381,6 +10517,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
@@ -10401,26 +10538,336 @@ msgstr ""
 msgid "Checklist"
 msgstr "Brétema espesa"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Cartafoles"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Amosar só os cartafoles subscritos"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Espacio de nomes"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Para ler e almacenar correo en servidores IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor de SMTP %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servicio %s para %s en %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/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 "Non foi posible conectarse a %s (porto %d): %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Erro enviando o nome de usuario: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
+#, 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/imap4/camel-imap4-store.c:287
+#: 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:1109
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Non hai soporte para o mecanismo de autenticación solicitado."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "O nome do cartafol non pode conter o carácter Return."
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "_Compañía:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Non hai tarefas"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente"
+
 #: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
-#: 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:1089
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10463,21 +10910,21 @@ msgstr "Non foi posible crear o directorio %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10493,25 +10940,25 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: 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:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo información de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -10556,23 +11003,6 @@ msgstr ""
 msgid "Command:"
 msgstr "_Compañía:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Cartafoles"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Amosar só os cartafoles subscritos"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espacio de nomes"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
@@ -10595,89 +11025,45 @@ 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:424
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Servidor de SMTP %s"
-
-#: 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:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: 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 "Non foi posible conectarse a %s (porto %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: 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:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10688,25 +11074,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "O nome do cartafol non pode conter o carácter Return."
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10714,7 +11093,7 @@ msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro descoñecido: %s"
@@ -10822,58 +11201,58 @@ msgid ""
 msgstr ""
 "Para ler e armacenar correo local en ficheiros spool estándar de tipo mbox."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
 #: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raíz de almacenamento %s non é unha ruta absoluta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O raíz de armacenamento %s non é un directorio normal."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non teñen un inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 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:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10940,7 +11319,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11286,7 +11665,7 @@ msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: camel/providers/nntp/camel-nntp-folder.c:263
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -11296,8 +11675,8 @@ msgid "User cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11308,49 +11687,49 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, fuzzy, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Non foi posible recibir a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: camel/providers/nntp/camel-nntp-folder.c:373
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:438
 msgid "Error reading response to posted message: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
@@ -11469,7 +11848,7 @@ msgstr "Non foi posible crear unha canalización: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11523,8 +11902,8 @@ msgstr "Non existe a mensaxe con UID %s"
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitación descoñecida"
@@ -11994,7 +12373,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
@@ -12039,6 +12418,98 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Non se pode abrir a mensaxe"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Non foi posible recibir a mensaxe do editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mensaxe Sen Título)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Gravar sinatura"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Compoñer unha mensaxe"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:3175
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"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:3279
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+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:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -12124,214 +12595,141 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:695
-#, 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:701
-#, 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:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Non se pode abrir a mensaxe"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Non foi posible recibir a mensaxe do editor"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mensaxe Sen Título)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2087
-#, fuzzy
-msgid "Signature:"
-msgstr "Gravar sinatura"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Compoñer unha mensaxe"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Anexar un ficheiro á mensaxe"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
 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:3269
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 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:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid "All accounts have been removed."
-msgstr "Cada conta ten que ter un nome diferente."
+msgid "Unfinished messages found"
+msgstr "Seguinte Mensaxe Sen Ler"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "¿Está seguro de que quere borrar esta cita sen título?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+msgid "Do you want to recover unfinished messages?"
+msgstr "¿Quere gardar os cambios?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Non foi posible crear unha canalización: %s"
+msgid "Don't Recover"
+msgstr "Non eliminar"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
+msgid "Recover"
+msgstr "Eliminar"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Imprimir tarxeta"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "¿Quere gardar os cambios?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Erro ao gardar os atallos."
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
-msgid "Don't Recover"
-msgstr "Non eliminar"
+msgid "Warning: Modified Message"
+msgstr "Mensaxe Remitida"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Erro ao gardar os atallos."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Eliminar"
+msgid "Discard Changes"
+msgstr "Imprimir tarxeta"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Gardar Mensaxe Como..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Non foi posible crear unha canalización: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Seguinte Mensaxe Sen Ler"
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-#, fuzzy
-msgid "Warning: Modified Message"
-msgstr "Mensaxe Remitida"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Anexar un ficheiro á mensaxe"
+msgid "All accounts have been removed."
+msgstr "Cada conta ten que ter un nome diferente."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12463,7 +12861,8 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: e-util/e-dialog-utils.c:251
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
@@ -12651,85 +13050,101 @@ msgstr "Seleccionar un Fuso Horario"
 msgid "_Filter Rules"
 msgstr "Regras de Filtrado"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Erro na expresión regular '%s':\n"
-"%s"
+msgid "Missing date."
+msgstr "Actualización da Xuntanza"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+msgid "Missing file name."
+msgstr "_Nome da lista:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Actualización da Xuntanza"
+msgid "You must specify a file name."
+msgstr "Nome do estilo:"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "_Nome da lista:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Resumindo cartafol"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Asignación"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "Nome do estilo:"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Non se seleccionou ningún servidor"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Oops. Esqueceu escoller unha data."
+msgid "Missing name."
+msgstr "Asignación"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Nome do estilo:"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "Nome do estilo:"
+msgid "No sources selected."
+msgstr "Non se seleccionou ningún servidor"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
 msgstr ""
 
 #: filter/filter-file.c:288
@@ -12743,69 +13158,11 @@ msgstr "Escolla unha Acción"
 msgid "<b>Then</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: 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:925 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:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Later"
-msgstr "despois"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Nome da regra: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Sen título"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Descrición:</b> %s"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Executar accións"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "se se cumpren tódolos criterios"
-
-#: filter/filter-rule.c:813
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "se se cumpre algún criterio"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "entrante"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "saínte"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12901,6 +13258,80 @@ msgstr "con todos os cartafoles locais"
 msgid "years"
 msgstr "anos"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Importante"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Later"
+msgstr "despois"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Nome da regra: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "se se cumpren tódolos criterios"
+
+#: filter/filter-rule.c:854
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "se se cumpre algún criterio"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Executar accións"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegado"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Substituír"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Respondido a"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Incluír:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "entrante"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "saínte"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -13038,7 +13469,7 @@ msgstr "Marcada"
 msgid "Junk Test"
 msgstr "xuño"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -13079,7 +13510,7 @@ msgstr "Saír do programa"
 msgid "Play Sound"
 msgstr "Tocar un son:"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Ler"
 
@@ -13152,9 +13583,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: 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:318
+#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Asunto"
@@ -13219,120 +13650,69 @@ msgstr "O asunto non contén"
 msgid "Virtual _Folders"
 msgstr "Cartafoles Virtuais"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Engadir"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferencias da Axenda"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-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 ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-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:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Contas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferencias da Axenda"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 #, fuzzy
 msgid "[Default]"
 msgstr "Por de_fecto"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da Cont_a:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 #, fuzzy
 msgid "Language(s)"
 msgstr "Idioma"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Borrar todo agás a sinatura"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Mensaxe Remitida"
+
+#: mail/em-composer-utils.c:1499
+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-composer-utils.c:1509
+#, 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-folder-browser.c:129
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
@@ -13372,499 +13752,459 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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:299
+#, fuzzy
+msgid "Create"
+msgstr "Previsualizar"
+
 #: 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:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "CartafolesV"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Entrada"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-#, fuzzy
-msgid "Loading..."
-msgstr "Agardando..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Copiar ó Cartafol"
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Mover ó Cartafol"
+
+#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancelar Tarefa"
+
+#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copiar"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr "CartafolesV"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Entrada"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#, fuzzy
+msgid "Loading..."
+msgstr "Agardando..."
+
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
+msgid "Mail"
+msgstr "Correo"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Regras de Filtrado"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "CartafolV polo Au_tor"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtrar polo Au_tor"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Prema para engadir unha tarefa"
 
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Prema para engadir unha tarefa"
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Aparicións:"
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Asignada"
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
 
-#: mail/em-format-html-display.c:646
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
-"autenticidade"
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Responder-A"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Engadir criterio"
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
 
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
-"autenticidade"
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Engadir criterio"
+msgid "Bcc"
+msgstr "Bcc:"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s anexo"
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Indefinida"
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-#, fuzzy
-msgid "Encrypted, weak"
-msgstr "Mensaxe cifrada"
-
-#: mail/em-format-html-display.c:656
-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.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Encrypted"
-msgstr "Cifrar con PGP"
+msgid "Unsupported signature format"
+msgstr "O usuario cancelou a operación."
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Mensaxe cifrada"
+msgid "Unknown error verifying signature"
+msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format-html-display.c:658
-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.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Recibindo a mensaxe %s"
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
-msgid "_View Certificate"
-msgstr "ID do certificado:"
+msgid "Unsigned"
+msgstr "Asignada"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Esta mensaxe non está dispoñible actualmente."
+msgid "Valid signature"
+msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "O %d de %B ás %k:%M"
+msgid "Invalid signature"
+msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:1010
-#, fuzzy
-msgid "Overdue:"
-msgstr "Tarefas _retrasadas:"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "O %d de %B ás %k:%M"
+msgid "Unencrypted"
+msgstr "Indefinida"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 #, fuzzy
-msgid "_View Inline"
-msgstr "Ver Inline"
+msgid "Encrypted, weak"
+msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
-msgid "_Hide"
-msgstr "Agochar"
-
-#: mail/em-format-html-print.c:125
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Recibindo a mensaxe %d de %d"
+msgid "Encrypted"
+msgstr "Cifrar con PGP"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Recibindo a mensaxe %s"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, 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:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "De"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Responder-A"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-#, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13872,82 +14212,146 @@ msgstr ""
 "Cliente de Correo: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 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:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Aparicións:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s anexo"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format-html-display.c:645
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format.c:1339
+#: mail/em-format-html-display.c:647
+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:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:654
+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:655
+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:656
+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:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "O usuario cancelou a operación."
+msgid "_View Certificate"
+msgstr "ID do certificado:"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Non se puido verifica-los certificados."
+msgid "This certificate is not viewable"
+msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Non se puido verifica-los certificados."
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "O %d de %B ás %k:%M"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tarefas _retrasadas:"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "O %d de %B ás %k:%M"
+
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "Ver Inline"
+
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "Agochar"
+
+#: mail/em-format-html-print.c:126
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Cada"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Un día"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Unha sema_na"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Un m_es"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13955,26 +14359,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Non se puido descodifica-la mensaxe."
+msgid "Unable to create new folder `%s': %s"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Non se puido descodifica-la mensaxe."
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Non é posible desprazarse no ficheiro: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Non foi posible crear o ficheiro de saída: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Gardar Como..."
@@ -13984,100 +14418,84 @@ msgstr "Gardar Como..."
 msgid "untitled_image.%s"
 msgstr "Mensaxes Sen Título"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, 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:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscribir"
 
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 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:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Mensaxe Remitida"
-
-#: mail/em-utils.c:1137
-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:1147
-#, 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:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "_Enderezo:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mensaxe de %s"
@@ -14097,11 +14515,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -14215,167 +14633,168 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Contas"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Contas"
+
+#: mail/evolution-mail.schemas.in.in.h:32
 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:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 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."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 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:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "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:40
 #, 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:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "_Prioridade:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 #, 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:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, 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:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14429,8 +14848,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "_Prioridade:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14573,37 +14993,72 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Compositor de correo de Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Compositor de correo de Evolution."
+msgid "Composer Preferences"
+msgstr "Preferencias da Axenda"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Configure your email accounts here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Contas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Correo"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14611,15 +15066,15 @@ 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:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 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:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
@@ -14651,19 +15106,51 @@ msgid "Select folder to import into"
 msgstr "Seleccionar Cartafol"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importando"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importando"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
@@ -14673,7 +15160,7 @@ msgstr "Examinando %s"
 msgid "Priority Filter \"%s\""
 msgstr "_Prioridade:"
 
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14688,7 +15175,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14696,7 +15183,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14705,25 +15192,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 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:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Importando Datos"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Opcións"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14759,130 +15246,141 @@ msgid "Pine"
 msgstr "Imprimir"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Respondido a"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d seleccionada(s)"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Borrador"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d seleccionada(s)"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Novo CartafolV"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editar Filtros"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crear unha nova mensaxe"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "O URI que ha amosar a axenda"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Comprobando Servicio"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14893,13 +15391,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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14909,16 +15407,16 @@ msgstr ""
 "non está seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opcións"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14928,11 +15426,11 @@ msgstr ""
 "está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Xestión de Contas"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14949,14 +15447,6 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Comprobando Servicio"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -15282,7 +15772,7 @@ msgstr "Executar accións"
 
 #: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "remata en"
 
 #: mail/mail-config.glade.h:82
@@ -15625,345 +16115,459 @@ msgstr " cor"
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autenticación"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requirida"
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "¿Está seguro de que quere borrar esta conta?"
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
-#: mail/mail-errors.xml.in.h:6
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
+msgid "_Send"
+msgstr "Enviar"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-errors.xml.in.h:8
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
-msgid "Are you sure you want to send a message without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Non é posible obter o cartafol: %s: %s"
+msgid "Use default drafts folder?"
+msgstr "Abrindo cartafol %s"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Non é posible obter o cartafol: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Incapaz de abrir o cartafol de borradores para esta conta.\n"
+"¿Gostaríalle usar o cartafol de borradores por defecto?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Non foi posible crear o directorio temporal: %s"
+msgid "Use _Default"
+msgstr "Por de_fecto"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Non se pode crear o directorio\n"
-"%s\n"
-"Erro: %s"
+"¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
+msgid "_Expunge"
+msgstr "_Limpar"
+
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
+"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
-#: mail/mail-errors.xml.in.h:19
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "O cartafol `%s' non existe."
+msgid "_Empty Trash"
+msgstr "Baleirar _Lixo"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:20
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Error while {0}."
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
+"Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Non foi posible renomear o cartafol: %s"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Non foi posible renomear o cartafol: %s"
+msgid "Error while performing operation."
+msgstr ""
+"Erro ao efectuar a operación:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Non se pode abrir a mensaxe"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:session-message-info secondary
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+msgid "{0}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Non foi posible renomear o cartafol %s a %s: %s"
+msgid "Enter password."
+msgstr "Contrasinal"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Erro ao cargar a información do filtro:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Borrar todo agás a sinatura"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Eliminar"
+"Non se pode crear o directorio\n"
+"%s\n"
+"Erro: %s"
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "¿Borrar esta conta de verdade?"
+msgid "Cannot create temporary save directory."
+msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:no-create-tmp-path secondary
+#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "¿Quere gardar os cambios?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Non borrar"
+msgid "File exists but cannot overwrite it."
+msgstr "O ficheiro existe, ¿sobrescribir?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Contrasinal"
+msgid "File exists but is not a regular file."
+msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Erro ao cargar a información do filtro:\n"
+"Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
-"Erro ao efectuar a operación:\n"
+"Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Erro durante '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "O ficheiro existe, ¿sobrescribir?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+msgid "Delete \"{0}\"?"
+msgstr "Eliminar"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Elimina-lo cartafol '%s'"
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autenticación"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:48
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Actualizar automaticamente"
+msgid "Cannot open source \"{2}\"."
+msgstr "Non foi posible renomear o cartafol: %s"
 
-#: mail/mail-errors.xml.in.h:49
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-errors.xml.in.h:50
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Elimina-lo cartafol '%s'"
+msgid "Cannot open source \"{1}\""
+msgstr "Non foi posible renomear o cartafol: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Non encheu toda a información requirida."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Non pode crear dúas contas co mesmo nome"
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "¿Borrar esta conta de verdade?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "¿Está seguro de que quere borrar esta conta?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Non borrar"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
 msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Borrar todo agás a sinatura"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requirida"
+msgid "Do you wish to save your changes?"
+msgstr "¿Quere gardar os cambios?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15971,86 +16575,89 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"¿Gostaríalle usar o cartafol de borradores por defecto?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Por de_fecto"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Abrindo cartafol %s"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Non encheu toda a información requirida."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Non pode crear dúas contas co mesmo nome"
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "O cartafol `%s' non existe."
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Baleirar _Lixo"
-
-#: mail/mail-errors.xml.in.h:73
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Limpar"
+msgid "vFolders automatically updated."
+msgstr "Actualizar automaticamente"
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Enviar"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
 #, fuzzy
-msgid "vFolders automatically updated."
+msgid "Mail filters automatically updated."
 msgstr "Actualizar automaticamente"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "¿Sobrescribir ficheiro?"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Abrir"
+
+#: mail/mail-folder-cache.c:787
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
@@ -16059,135 +16666,135 @@ msgstr "Examinando %s"
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16196,7 +16803,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16205,11 +16812,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16218,17 +16825,17 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
@@ -16295,25 +16902,25 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16357,91 +16964,96 @@ msgstr "Mensaxe remitida"
 msgid "Invalid folder: `%s'"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:235
 #, fuzzy, c-format
-msgid "Updating vfolders for uri: %s"
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Examinando os cartafoles en \"%s\""
+
+#: mail/mail-vfolder.c:959
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -16476,47 +17088,47 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 #, fuzzy
 msgid "Call"
 msgstr "Resposta"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Adiante"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 #, fuzzy
 msgid "For Your Information"
 msgstr "Información da Fonte"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Remitir"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 #, fuzzy
 msgid "Review"
 msgstr "Previsualizar"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16564,21 +17176,6 @@ msgstr "_Subscribir"
 msgid "_Unsubscribe"
 msgstr "_Desubscribir"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "O shell de Evolution."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Compositor de correo de Evolution."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16586,110 +17183,54 @@ msgstr "389"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Renomear este grupo de atallos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Agochar a barra de atallos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "_Prioridade:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "_Prioridade:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Interface de configuración do correo"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 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
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 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
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 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
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 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
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Trocar a mostra da barra de cartafoles"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Trocar a mostra da barra de atallos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Correo Electrónico"
@@ -16698,6 +17239,32 @@ msgstr "Correo Electrónico"
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d de %b"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Erro descoñecido"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Argumentos non válidos"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Non se pode rexistrar en OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Non se atopou a Base de Datos de configuracións"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Erro xenérico"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sen_título)"
@@ -16838,11 +17405,11 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
@@ -16882,11 +17449,31 @@ msgstr "O nome do cartafol non pode conter o carácter Return."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolucion está conectado. Prema neste botón para desconectar."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está desconectándose"
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution está desconectado. Prema neste botón para conectar."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mensaxe para %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar o filtro: %s: %s"
@@ -16902,7 +17489,7 @@ msgstr "Non foi posible executar o Bug buddy."
 
 #: shell/e-shell-window-commands.c:171
 #, fuzzy
-msgid "About Ximian Evolution"
+msgid "About Evolution"
 msgstr "Acerca de Evolution..."
 
 #: shell/e-shell-window-commands.c:382
@@ -16910,7 +17497,7 @@ msgstr "Acerca de Evolution..."
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
@@ -16918,47 +17505,6 @@ msgstr "_Traballar Desconectado"
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-window.c:338
-#, fuzzy
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolucion está conectado. Prema neste botón para desconectar."
-
-#: shell/e-shell-window.c:345
-#, fuzzy
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Evolution está desconectándose"
-
-#: shell/e-shell-window.c:351
-#, fuzzy
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution está desconectado. Prema neste botón para conectar."
-
-#: shell/e-shell.c:536
-#, 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"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Argumentos non válidos"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Non se pode rexistrar en OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Non se atopou a Base de Datos de configuracións"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Erro xenérico"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -17023,6 +17569,51 @@ msgstr "Conexións activas"
 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
+msgid "C_alendar:"
+msgstr "Axenda"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Co_ntactos:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Correo"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tarefas"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Tipo do cartafol:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Crear un _Novo Cartafol..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Conta"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nome do cartafol:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "Nome de _Usuario:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -17058,6 +17649,21 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "O shell de Evolution."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Compositor de correo de Evolution."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Prema en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -17124,13 +17730,13 @@ 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:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
 "but some features are either unfinished or do not work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -17156,75 +17762,131 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Non se pode acceder ao shell de Evolution."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Non se pode inicializar o shell de Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:501
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 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:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "C_ontén:"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Non se pode acceder ao shell de Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Asistente de Contas de Evolution"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Seleccionar Cartafol"
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
@@ -17477,12 +18139,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#. 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"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17704,6 +18360,12 @@ msgstr "O asunto é %s"
 msgid "Certificate Signature Value"
 msgstr "Ficheiro de sinatura:"
 
+#. 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"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17748,12 +18410,12 @@ msgstr "Borrar esta mensaxe"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17821,7 +18483,8 @@ msgid "Select all contacts"
 msgstr "Seleccionar tódolos contactos"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Enviar unha mensaxe aos contactos seleccionados."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17854,8 +18517,8 @@ msgstr "a hora actual"
 #: 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-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "_Accións"
@@ -17873,7 +18536,8 @@ msgid "_Preview Pane"
 msgstr "_Panel de Previsualización"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Gardar coma VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18009,11 +18673,21 @@ msgstr "a hora actual"
 msgid "Week"
 msgstr "Semana"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Semana Laboral"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "Cita"
 
+#: 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"
+msgstr "P_echar"
+
 #: 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
@@ -18349,6 +19023,16 @@ msgstr "_Inverter Selección"
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por Fíos"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "_Pechar"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18607,7 +19291,8 @@ msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Abri-la mensaxe seleccionada no compositor para re-enviala"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18731,65 +19416,52 @@ msgstr "CartafolV polo A_sunto"
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copiar ó Cartafol"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir A"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Inline"
 msgstr "Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Mover ó Cartafol"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Visualización _Normal"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Resend..."
-msgstr "_Renomear..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Ferramentas"
@@ -18798,16 +19470,6 @@ msgstr "_Ferramentas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "_Pechar"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -19224,6 +19886,11 @@ msgstr "Preferencias da Axenda"
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Buscar Agora"
+
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -19303,11 +19970,6 @@ msgstr "_Data Límite"
 msgid "With _Status"
 msgstr "Establecer Estado"
 
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "_Tarefa"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19473,6 +20135,35 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Información da Xuntanza"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Compositor de correo de Evolution."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Mensaxes Enviadas e Borradores"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19598,6 +20289,35 @@ msgstr "Proba"
 msgid "Find _Now"
 msgstr "Buscar Agora"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"%s xa existe\n"
+"¿Quere sobrescribilo?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19609,8 +20329,140 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Libro de Enderezos"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Enderezo _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "para sempre"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Editor de Novas de Evolution"
+
+#~ msgid "Snoo_ze"
+#~ msgstr "A_diar"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Non foi posible inicializar gnome-vfs"
+
+#, fuzzy
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Non foi posible abrir o cartafol en `%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "O URI que ha amosar a axenda"
+
+#~ msgid "Display a message"
+#~ msgstr "Amosar unha mensaxe"
+
+#, fuzzy
+#~ msgid "Alerts"
+#~ msgstr "Alarmas"
+
+#~ msgid "Time"
+#~ msgstr "Hora"
+
+#~ msgid "_General"
+#~ msgstr "_Xeral"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Seleccionar Cartafol"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Axenda"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Lista de _Tarefas"
+
+#, fuzzy
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "¡Non se puido envia-lo elemento!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "O URI do cartafol de tarefas a amosar"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Non foi posible cargar as tarefas en `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "CartafolV polo Au_tor"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrar polo Au_tor"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Non se puido descodifica-la mensaxe."
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Non se puido descodifica-la mensaxe."
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Non se puido descodifica-la mensaxe."
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "O URI que ha amosar a axenda"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Renomear este grupo de atallos"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Agochar a barra de atallos"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Trocar a mostra da barra de cartafoles"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Trocar a mostra da barra de atallos"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Non se pode inicializar o shell de Evolution: %s"
+
+#, fuzzy
+#~ msgid "_Resend..."
+#~ msgstr "_Renomear..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19690,9 +20542,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Cónxuxe:"
 
-#~ msgid "_Add"
-#~ msgstr "_Engadir"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "_Traballo"
@@ -19745,18 +20594,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Task List Creation Assistant"
 #~ msgstr "Fontes do Libro de Enderezos"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Data de _Inicio:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Data Límite"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioridade:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19787,14 +20624,6 @@ msgstr "%s (%d%% completa)"
 #~ "Non foi posible trunca-lo ficheiro: %s\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non é posible desprazarse no ficheiro: %s\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19932,10 +20761,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Previsualiza a axenda que se vai imprimir"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Introduza o seu contrasinal para %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Lista de _Tarefas"
 
@@ -20008,38 +20833,6 @@ msgstr "%s (%d%% completa)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "C_alendar:"
-#~ msgstr "Axenda"
-
-#, fuzzy
-#~ msgid "_Mail:"
-#~ msgstr "_Correo"
-
-#, fuzzy
-#~ msgid "_Tasks:"
-#~ msgstr "Tarefas"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Tipo do cartafol:"
-
-#, fuzzy
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Crear un _Novo Cartafol..."
-
-#, fuzzy
-#~ msgid "_Account:"
-#~ msgstr "Conta"
-
-#, fuzzy
-#~ msgid "_Folder Name:"
-#~ msgstr "Nome do cartafol:"
-
-#, fuzzy
-#~ msgid "_User:"
-#~ msgstr "Nome de _Usuario:"
-
-#, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Crear unha nova tarefa"
 
@@ -20393,9 +21186,6 @@ msgstr "%s (%d%% completa)"
 #~ 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"
 
@@ -20647,10 +21437,6 @@ msgstr "%s (%d%% completa)"
 #~ "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
 #~ "autenticidade"
 
-#, fuzzy
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20761,18 +21547,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Recordatorios"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Descrición:</b> %s"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "información de axenda"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Clasificación"
 
@@ -21839,10 +22613,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Cartafol que contén o Resumo de Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Compositor de correo de Evolution."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Compositor de correo de Evolution."
 
@@ -22139,10 +22909,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Austria"
 
 #, fuzzy
-#~ msgid "Aspen"
-#~ msgstr "Abrir"
-
-#, fuzzy
 #~ msgid "Asswan"
 #~ msgstr "Asistente"
 
@@ -22811,10 +23577,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Congo"
 
 #, fuzzy
-#~ msgid "Constantine"
-#~ msgstr "C_ontén:"
-
-#, fuzzy
 #~ msgid "Cordoba"
 #~ msgstr "Colombia"
 
@@ -22867,10 +23629,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Pregunta"
 
 #, fuzzy
-#~ msgid "Crestview"
-#~ msgstr "Previsualizar"
-
-#, fuzzy
 #~ msgid "Crotone"
 #~ msgstr "Camerún"
 
@@ -24474,10 +25232,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Normal"
 
 #, fuzzy
-#~ msgid "Nome"
-#~ msgstr "Nome:"
-
-#, fuzzy
 #~ msgid "Norfolk"
 #~ msgstr "Illa Norfolk"
 
@@ -26118,9 +26872,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Shown"
 #~ msgstr "Chuvieira"
 
-#~ msgid "No tasks"
-#~ msgstr "Non hai tarefas"
-
 #, fuzzy
 #~ msgid "(No Description)"
 #~ msgstr "Descrición:"
@@ -27207,9 +27958,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Delete news feed"
 #~ msgstr "Tódalas _fontes de novas:"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correo"
-
 #~ msgid "_Weather"
 #~ msgstr "_Tempo"
 
@@ -28426,9 +29174,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
@@ -28840,9 +29585,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Recordatorio da cita en "
 
-#~ msgid "Snooze"
-#~ msgstr "Adiar"
-
 #~ msgid ""
 #~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
 #~ "to know."
@@ -29522,9 +30264,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Redo the undone action"
 #~ msgstr "Refacer a acción desfeita"
 
-#~ msgid "Replace"
-#~ msgstr "Substituír"
-
 #~ msgid "Replace a string"
 #~ msgstr "Substituír unha cadea"
author	JP Rosevear <jpr@novell.com>	2004-05-20 02:35:59 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2004-05-20 02:35:59 +0800
commit	c7dbb95e79df331a75d7ba49cedc1b8e816422cf (patch)
tree	f8c9851496db10145da1c5bd7e482dc3fd9e1c1d /po/gl.po
parent	a9b7ecefe5f6cce56289744e0b68679835634c02 (diff)
download	gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.gz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.zst gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.zip