Sync for the release.

svn path=/trunk/; revision=11530

1 files changed, 7538 insertions, 3756 deletions

diff --git a/po/gl.po b/po/gl.po
index d590753168..ff2e326e2c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-04-26 00:03+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -20,11 +20,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fábrica para importar ficheiros GnomeCard a Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importa ficheiros GnomeCard a Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -32,7 +42,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -40,7 +50,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -48,7 +58,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -56,7 +66,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -64,7 +74,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -72,7 +82,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -80,7 +90,7 @@ msgstr ""
 "\n"
 "Data de nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -88,7 +98,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -96,7 +106,7 @@ msgstr ""
 "\n"
 "  Apdo. de correos: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -104,7 +114,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -112,7 +122,7 @@ msgstr ""
 "\n"
 "  Rúa:         "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -120,7 +130,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -128,7 +138,7 @@ msgstr ""
 "\n"
 "  Rexión:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -136,7 +146,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -144,7 +154,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -152,7 +162,7 @@ msgstr ""
 "\n"
 "Etiqueda de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -160,7 +170,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -168,7 +178,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "Cliente de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -208,7 +218,7 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -216,7 +226,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -224,7 +234,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -232,7 +242,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -248,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -256,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -264,7 +274,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -272,7 +282,7 @@ msgstr ""
 "\n"
 "Categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -290,7 +300,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -298,7 +308,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -306,27 +316,25 @@ msgstr ""
 "\n"
 "Clave pública: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Fábrica para importar ficheiros GnomeCard a Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Múltiples Mensaxes"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importa ficheiros GnomeCard a Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Introduza o contrasinal %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -339,14 +347,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
@@ -356,726 +364,848 @@ msgstr "Non foi posible iniciar wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo de pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Un control de Bonobo para un menú emerxente de enderezo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un control de Bonobo para amosar un enderezo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Unha mostra de control de Bonobo que amosa un libro de enderezos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Compoñente de Evolution para manexar contactos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fábrica para o control da Minitarxeta do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fábrica para o visor de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fábrica para o menú emerxente do enderezo do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fábrica para a mostra de control do Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Ficheiro"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo de libro de enderezos descoñecido"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Ningún (modo anónimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo de autenticación descoñecido"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Único"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Subárbore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo de ámbito descoñecido"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Asignar ND:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "AMÁÑAME Texto de axuda para Asignar ND aquí"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar este contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "AMÁÑAME Texto de axuda para Servidor aquí"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "ND Raíz:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "AMÁÑAME Texto de axuda para ND Raíz aquí"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porto:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "AMÁÑAME Texto de axuda para Porto aquí"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Buscar Ámbito:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autenticación:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Camiño:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "AMÁÑAME Texto de axuda para Camiño aquí"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Crear camiño se non existe."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Engadir Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Elixe a clase de Libro de Enderezos que tes, e introduce a información "
+"relevante sobre el."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "AMÁÑAME Texto de axuda para Nome aquí"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descrición:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Engadir"
+msgid "Addressbook Sources"
+msgstr "Engadir Fontes para o Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Engadir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Introduza o contrasinal %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Calquera campo contén"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nome contén"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Enderezo contén"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nome contén"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "O URI que amosará o Navegador de Cartafoles"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Correo electrónico principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Correo Electrónico 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Correo Electrónico 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Seleccionar un ficheiro"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un novo contacto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Editar Información de Contacto"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Engadir a Contactos"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Enderezo de Correo-E:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Desactivar Peticións"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Activar Peticións (¡Perigoso!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaz de selección de nome do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+"Fábrica para a interfaz de selección de nome do Libro de Enderezos de "
+"Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Quitar Todos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Enviando Correo"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinatarios da mensaxe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleccionar nome desde:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categoría:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_raballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax do traballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Arquivar como:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Novo tipo de teléfono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organización:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipos de teléfono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Correo electrónico principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Enderezo da páxina Web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Engadir"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compañía:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactos..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome do _Xestor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Móbil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Sobrenome:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Este é o enderezo da lista de correo"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "¿Borrar Contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Reincorporación"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Automóbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Móbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Correo Electrónico 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "¿Borrar Contacto?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canadá"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprobar Enderezo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_País:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Estados Unidos"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Código _Postal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Comprobar Nome Completo"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Don"
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "fillo"
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Sriña."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Sra."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sra."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como unha _Táboa"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduza o contrasinal %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Non fomos capaces de abrir este libro de enderezos. Isto\n"
-"significa que ou introduciches unha URI incorrecta, ou\n"
-"que se tentou acceder a un servidor LDAP e o programa\n"
-"non está compilado con soporte LDAP. Se introduciches\n"
-"unha URI comproba que sexa correcta e volve introducila.\n"
-"Senón, probablemente tentaches acceder a un servidor\n"
-"LDAP. Se desexas poder usar LDAP, necesitarás baixar e\n"
-"instalar OpenLDAP e recompilar e instalar Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555 widgets/misc/e-filter-bar.h:95
-msgid "Show All"
-msgstr "Ver Todos"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avanzado..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Calquera campo contén"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Nome contén"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Enderezo contén"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que amosará o Navegador de Cartafoles"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Ficheiro"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo de libro de enderezos descoñecido"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ningún (modo anónimo)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Tipo de autenticación descoñecido"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Único"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Subárbore"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Tipo de ámbito descoñecido"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Asignar ND:"
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr "AMÁÑAME Texto de axuda para Asignar ND aquí"
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Lembrar este contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr "AMÁÑAME Texto de axuda para Servidor aquí"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Porto:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome de ficheiro:"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "AMÁÑAME Texto de axuda para Porto aquí"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "decembro"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "ND Raíz:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "AMÁÑAME Texto de axuda para ND Raíz aquí"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Buscar Ámbito:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Quitar"
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autenticación:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Camiño:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr "AMÁÑAME Texto de axuda para Camiño aquí"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Crear camiño se non existe."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Editar o Libro de Enderezos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Engadir Libro de Enderezos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Elixe a clase de Libro de Enderezos que tes, e introduce a información "
-"relevante sobre el."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr "AMÁÑAME Texto de axuda para Nome aquí"
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrición:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Engadir Fontes para o Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Eliminar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Editar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Desactivar Peticións"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Activar Peticións (¡Perigoso!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Editar Información de Contacto"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Engadir a Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un control de Bonobo para un menú emerxente de enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control de Bonobo para amosar un enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Unha mostra de control de Bonobo que amosa un libro de enderezos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Compoñente de Evolution para manexar contactos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fábrica para o control da Minitarxeta do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fábrica para o visor de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fábrica para o menú emerxente do enderezo do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fábrica para a mostra de control do Libro de Enderezos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Quitar"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Quitar Todos"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaz de selección de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fábrica para a interfaz de selección de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Buscar..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatarios da mensaxe"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleccionar Nomes"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleccionar nome desde:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1187,156 +1317,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Enviar contacto a outro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:51 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Configuración da Impresión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fontes"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Traballar desconectado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Ficheiro non atopado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operación non soportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erro de E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Erro lendo os datos:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Prema aquí para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Teléfono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Teléfono de Negocios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Teléfono de Reincorporación"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Teléfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Teléfono Automóbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Teléfono Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Outro Teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Sobrenome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Cónxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL libre-ocupada"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Feito"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Cargando axenda..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1379,7 +1607,8 @@ msgid "Dimensions:"
 msgstr "Dimensións:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1439,7 +1668,6 @@ msgid "Margins"
 msgstr "Marxes"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
@@ -1519,39 +1747,64 @@ msgstr "Tipo:"
 msgid "Width:"
 msgstr "Largura:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Fonte..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicación pilot da Axenda"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación pilot ToDo (PorFacer)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Recordatorio da cita en "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Unha mostra de control Bonobo que mostra unha axenda."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Adiar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Compoñente da axenda do resume executivo de Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Aceptar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Compoñente de Evolution para manexar a axenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Fábrica para o compoñente Resume da Axenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Fábrica para o compoñente da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Fábrica para o control vista iTip da axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fábrica para a mostra de control Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fábrica para o compoñente da axenda de Evolution."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1561,140 +1814,258 @@ msgstr "Servicio de notificación de alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Fábica para o sercivio de notificación de alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Amosar información sobre o Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Pechar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Non hai resume dispoñible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Recordatorio da cita en "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Aceptar"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
-msgstr "Son (é) a(s) %s. O tempo Unix é agora %ld. Pensamos que che pode apetecer sabelo."
+msgstr ""
+"Son (é) a(s) %s. O tempo Unix é agora %ld. Pensamos que che pode apetecer "
+"sabelo."
 
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:109
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacin de alarma"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Ficheiro non atopado"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Abrir axenda"
+#. 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d de %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Gardar axenda"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B de %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Non foi posible crear o visor da axenda. Comproba a túa configuración de ORBit e OAF."
+msgstr ""
+"Non foi posible crear o visor da axenda. Comproba a túa configuración de "
+"ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completada"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelada"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1705,24 +2076,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
-"A clasificación ten que ser 'Pública', 'Privada', 'Confidencial' ou 'Ningunha'"
+"A clasificación ten que ser 'Pública', 'Privada', 'Confidencial' ou "
+"'Ningunha'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1732,116 +2108,292 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Recurrindo"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Vista de Tarxeta"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Citas"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana Lab_oral"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Definir Vistas"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tarefas"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mes"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erro cargando a axenda</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "O URI que amosará a axenda"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro cargando a axenda:<br>Método non soportado"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmas Sonoras"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Visualizar"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinatarios da mensaxe"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Amosar citas..."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Opcións de Vista"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Amosar tarefas"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Cousas por facer"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Cargando Axenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "O URI que amosará a axenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Almacenamento da mensaxe"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Non hai resume dispoñible."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Pechar"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editar cita"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "días"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualizar cada"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d días"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " un día"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " unha semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " unha hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " un minuto"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " un segundo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Tocar un son"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Mostrar todas as cabeceiras da mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Enviar unha mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Executar un programa"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " antes do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " despois do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " antes da fin desta cita"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " despois da fin desta cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data e hora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Recordatorios"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resume:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opcións"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "despois"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "antes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "día(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "fin da cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "hora(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "comezo da cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1872,36 +2424,38 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "As alarmas saltan despois de"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmas Sonoras"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Chifrar cando aparece a fiestra de alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferencias da Axenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Cores"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Opcións do navegador de Citas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1909,593 +2463,1091 @@ msgid "Defaults"
 msgstr "Opcións por defecto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Opcións de Vista"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-#, fuzzy
-msgid "Due Date"
-msgstr "Cita Agardada"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#, fuzzy
-msgid "Enable snoozing for"
-msgstr "Activar adiando para"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Final do día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primeiro día da semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Resaltar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#, fuzzy
-msgid "Items Due Today"
-msgstr "Cousas esperadas para hoxe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Items Due Today:"
-msgstr "Cousas esperadas para hoxe:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#, fuzzy
-msgid "Items Not Yet Due"
-msgstr "Cousas aínda non esperadas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#, fuzzy
-msgid "Items Not Yet Due:"
-msgstr "Cousas aínda non esperadas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Overdue Items"
-msgstr "Retrasar Cousas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
-msgid "Overdue Items:"
-msgstr "Retrasar Cousas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioridade"
+msgid "Overdue tasks"
+msgstr "Retrasar Cousas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Lembrarme todas as citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sáb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Amosar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Amosar os prazos finais das citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Amosar números de semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inicio do día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
-msgid "TaskPad"
-msgstr "Rota de Tarefas"
+msgid "Task List"
+msgstr "Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Cousas esperadas para hoxe"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Xoves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tempo ata que se deba facer"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Título"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisións da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Zona horaria: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmas Visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mér"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Semana de traballo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana Lab_oral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutos antes de que ocorran."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "segundos."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "¿Está seguro de que quere borrar esta conta?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Completada"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Completada"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Cita Agardada"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entrada de diario - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sen resume"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "¿Sobrescribir ficheiro?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Xa existe un ficheiro con ese nome.\n"
+"¿Sobrescribilo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "Save As..."
+msgstr "Gardar _Como..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "¿Está seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "¿Está seguro de que quere borrar esta tarefa sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "¿Quere gardar os cambios?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "¿Está seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Sen resume"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Seleccionar un ficheiro"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Seccións:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada de diario - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zona horaria: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Cita"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Recurrencia"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Cancelar Reunión"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Evento de día comp_leto"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificación"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data e hora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data Completada:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "En Progreso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data de _Inicio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "_Resume:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarefa"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contactos..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Hora de _finalización:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
 #, fuzzy
-msgid "_Due Date:"
-msgstr "_Data Estimada:"
+msgid "Group"
+msgstr "Nome do grupo:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioridade:"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Orixe do papel:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Estado:"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Categorías"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Presidir"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Participante Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Non-Participante"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Engadir acción"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Aceptar "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Rexeitar "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Teléfono Automóbil"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Participante Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Non-Participante"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Enviada"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Eliminar..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Ocupada"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Data de _finalización:"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Eliminada"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Data de _Inicio:"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Eliminada"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Posición xeográfica"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Xestor"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Porcentaxe colpleta"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "decembro"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "_Resume"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Transparencia"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Posto"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Estado"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Convidar Outros..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita contén recurrencias que Evolution non pode editar."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "o"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "día"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+#, fuzzy
+msgid "th"
+msgstr "4º"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ocurrencias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Recurrencia personalizada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Excepcións"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sen recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regra de Recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Recurrencia simple"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "para"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "para sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "ata"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "¿Quere gardar os cambios?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data Completada:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmas"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tarefa"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Prema aquí para engadir unha tarefa"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+#, fuzzy
+msgid "_Due Date:"
+msgstr "_Data Estimada:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Estado:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marcar como Completa"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marcar a tarefa como completa"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "Editar esta tarefa..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Editar Tarefa"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcar como Completa"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Borrar esta tarefa"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcar como Completa"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Borrar a tarefa"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Prema aquí para engadir unha tarefa"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Completo"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Data na que se completa"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Due Date"
+msgstr "Cita Agardada"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Data de _finalización:"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Posición xeográfica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "_Resume"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisións de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Novo Evento de día _completo"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Ir a Hoxe"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ir á Data"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "AMÁÑAME: Programar Reunión"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Borrar todas as Ocurrencias"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Borrar Todas as Ocurrencias"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisións de minuto"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "¡Non foi posible actualizar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Este é o enderezo da lista de correo"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Compoñente actualizada con éxito."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Houbo un erro cargando o ficheiro da axenda."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "¡Non foi posible abir o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "¡Non foi posible cargar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "¡Non foi posible ler o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "¡Esta é unha resposta de alguén que non foi convidado!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "¡Non foi posible actualizar o almacenamento da axenda!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "¡Non se puido borrar o compoñente da axenda!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Compoñente borrado con éxito."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Non se recoñece este tipo de compoñente de axenda."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Engadir á Axenda"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Aceptar "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Rexeitar "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Tentativa "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Actualizar Axenda"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Cancelar Reunión"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "¡Non foi posible actualizar o ficheiro da axenda!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "¡Non foi posible abir o ficheiro da axenda!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2510,26 +3562,22 @@ msgstr "--a--"
 msgid "Calendar Message"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Cargando Axenda"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Cargando axenda..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaxe de servidor:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resume:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "data-finalización"
@@ -2538,423 +3586,48 @@ msgstr "data-finalización"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Ocupada"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Enderezo ocupado"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Ocupadas: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Cancelar\n"
-"Reunión"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Presidir"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Convida para a Reunión"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Non-Participante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Participante Opcional"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizador:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publicar\n"
-"Evento"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Solicitar\n"
-"Reunión"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Participantes Requiridos"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Posto"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Programar\n"
-"Hora"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
-msgid "Status"
-msgstr "Estado"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Todas"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categoría:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "o"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "día"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "no"
-
-#: calendar/gui/event-editor.c:613
-#, fuzzy
-msgid "th"
-msgstr "4º"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "ocurrencias"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita contén recurrencias que Evolution non pode editar."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d días"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " un día"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d semanas"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " unha semana"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d horas"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " unha hora"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutos"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " un minuto"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d segundos"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " un segundo"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Tocar un son"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Amosar un diálogo"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Enviar unha mensaxe"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Executar un programa"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " antes do comezo da cita"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " despois do comezo da cita"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " antes da fin desta cita"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " despois da fin desta cita"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Evento de día comp_leto"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Básicos sobre Citas"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excepcións"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sen recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regra de Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Preferencias..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _finalización:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora de _comezo:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data de _comezo:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "despois"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "antes"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "día(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "fin da cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "para"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "para sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "hora(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mes(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "comezo da cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "ata"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "semana(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "ano(s)"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Nova Cita..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Borrar Todas as Ocurrencias"
-
 #. 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Amosar todas "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "O resume contén"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "O comentario contén"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Ten a categoría"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nova Cita..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Unha mostra de control Bonobo que mostra unha axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Compoñente da axenda do resume executivo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Compoñente de Evolution para manexar a axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fábrica para o compoñente Resume da Axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fábrica para o compoñente da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fábrica para o control vista iTip da axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fábrica para a mostra de control Axenda"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -2976,233 +3649,257 @@ msgid "Go To Date"
 msgstr "Ir á Data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir a hoxe"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "xaneiro"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "xullo"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "xuño"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "novembro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "outubro"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir a hoxe"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tarefas"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Día actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto está mal, o %a é o nome de semana
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1488
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimir este elemento"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Configuración da Impresión"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
@@ -3210,7 +3907,9 @@ msgstr "O URI do cartafol de tarefas a amosar"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas automaticamente ao novo cartafol de tarefas."
+msgstr ""
+"Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas "
+"automaticamente ao novo cartafol de tarefas."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3219,104 +3918,129 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution tentou coller as tarefas que estaban no cartafol da axenda e migralas automaticamente ao novo cartafol de tarefas.\n"
-"Non foi posible migrar algunhas das tarefas, así que pode tentar facerse este proceso outra vez no futuro."
+"Evolution tentou coller as tarefas que estaban no cartafol da axenda e "
+"migralas automaticamente ao novo cartafol de tarefas.\n"
+"Non foi posible migrar algunhas das tarefas, así que pode tentar facerse "
+"este proceso outra vez no futuro."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "Non se puido abrir `%s'; non se migrarán obxectos do cartafol da axenda ao de tarefas."
+msgstr ""
+"Non se puido abrir `%s'; non se migrarán obxectos do cartafol da axenda ao "
+"de tarefas."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr "Non está soportado o método requerido para cargar `%s'; non se migrarán obxectos do cartafol da axenda ao de tarefas."
+msgstr ""
+"Non está soportado o método requerido para cargar `%s'; non se migrarán "
+"obxectos do cartafol da axenda ao de tarefas."
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Non está soportado asinar por este cifrado"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Non está soportado asinar en claro por este cifrado"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Non está soportado verificar por este cifrado"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Non está soportado encriptar por este cifrado"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Non está soportado desencriptar por este cifrado"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr "Debe estar traballando conectado para completar esta operación"
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:666
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Completo"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro analizando o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro executando o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro executando búsqueda por filtro: %s: %s"
@@ -3352,17 +4076,38 @@ msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inválido nos contidos do corpo, agardábase unha cadea"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Non foi posible crear unha canalización: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Non foi posible facer fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "A operación expirou tentando obter o ficheiro de bloqueo sobre %s. Ténteo de novo máis tarde."
+msgstr ""
+"A operación expirou tentando obter o ficheiro de bloqueo sobre %s. Ténteo de "
+"novo máis tarde."
 
 #: camel/camel-lock.c:201
 #, c-format
@@ -3374,120 +4119,116 @@ msgstr "Fallo ao tentar obter bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo ao tentar obter bloqueo usando flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Non foi posible comprobar o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro lendo o ficheiro de correo: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro escribindo o ficheiro temporal de correo: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Erro ó almacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erro descoñecido)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro lendo o ficheiro de correo: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro escribindo o ficheiro temporal de correo: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erro copiando o ficheiro temporal de correo: %s"
 
-#: camel/camel-pgp-context.c:190
-#, c-format, fuzzy
+#: camel/camel-pgp-context.c:193
+#, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Non hai texto plano para asinar."
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1067
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Non hai texto plano para asinar en claro."
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Non hai texto plano para verificar."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1050
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Non hai texto plano para encriptar."
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Non se especificaron destinatarios."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Non hai texto cifrado para desencriptar."
 
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Non foi posible cargar %s: Non se soporta a carga de módulos neste sistema."
+msgstr ""
+"Non foi posible cargar %s: Non se soporta a carga de módulos neste sistema."
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -3499,37 +4240,37 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai código de inicialización no módulo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "servicio %s para %s en %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Conexión Cancelada"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(máquina descoñecida)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor desconectou inesperadamente"
 
@@ -3546,7 +4287,7 @@ msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
 #: camel/camel-sasl-anonymous.c:119
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -3555,7 +4296,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -3581,7 +4322,9 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Esta opción conectarase ó servidor usando un contrasinal seguro CRAM-MD5, se o servidor o soporta."
+msgstr ""
+"Esta opción conectarase ó servidor usando un contrasinal seguro CRAM-MD5, se "
+"o servidor o soporta."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3592,7 +4335,9 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Esta opción conectarase ó servidor usando un contrasinal seguro DIGEST-MD5, se o servidor o soporta."
+msgstr ""
+"Esta opción conectarase ó servidor usando un contrasinal seguro DIGEST-MD5, "
+"se o servidor o soporta."
 
 #: camel/camel-sasl-digest-md5.c:810
 #, fuzzy
@@ -3607,7 +4352,9 @@ msgstr "Resposta do servidor non válida\n"
 #: camel/camel-sasl-digest-md5.c:825
 #, fuzzy
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "A resposta do servidor contiña o sinal \"Quality of Protection\" (\"Calidade de Protección\") non válido\n"
+msgstr ""
+"A resposta do servidor contiña o sinal \"Quality of Protection\" (\"Calidade "
+"de Protección\") non válido\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -3640,7 +4387,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -3656,60 +4403,60 @@ msgstr "Esta opción conectarase ó servidor usando un simple contrasinal."
 msgid "Unknown authentication state."
 msgstr "Estado de autenticación descoñecido."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilación da espresión regular: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de máquina"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiño"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na búsqueda do nome: %s"
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na búsqueda do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na búsqueda do servidor: %s: motivo descoñecido"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo como petición de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3718,33 +4465,53 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Lixo"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "O ficheiro non existe."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "O ficheiro non existe."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Fallo ao enviar o nome de usuario ao servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Fallo na mensaxe %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"Enderezo de Correo-E: %s\n"
-"Nome Común: %s\n"
-"Unidade en Organización: %s\n"
-"Organización: %s\n"
-"Localidade: %s\n"
-"Estado: %s\n"
-"País: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3759,17 +4526,36 @@ msgstr ""
 "\n"
 "¿Desexa aceptar de todas maneiras?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"Enderezo de Correo-E: %s\n"
+"Nome Común: %s\n"
+"Unidade en Organización: %s\n"
+"Organización: %s\n"
+"Localidade: %s\n"
+"Estado: %s\n"
+"País: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar a URL `%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
@@ -3778,60 +4564,76 @@ msgstr "Non existe a mensaxe: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non podes copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Non foi posible abrir o directorio de caché: %s"
-
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de máis."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible cargar resume para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:349
-msgid "Scanning IMAP folder"
-msgstr "Explorando cartafol IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Gardando as mensaxes"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Gardando as mensaxes"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 #, fuzzy
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Non foi posible abrir o directorio de caché: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -3839,7 +4641,7 @@ msgstr "Comprobando o novo correo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -3850,7 +4652,8 @@ msgstr "Amosar namais cartafoles subscritos"
 #: camel/providers/imap/camel-imap-provider.c:52
 #, fuzzy
 msgid "Override server-supplied folder namespace"
-msgstr "Sobrescribir o nome do espacio de cartafoles proporcionado polo servidor"
+msgstr ""
+"Sobrescribir o nome do espacio de cartafoles proporcionado polo servidor"
 
 #: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
@@ -3874,28 +4677,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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 pedida."
 
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, 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:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3906,102 +4709,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr "O cartafol %s non é seleccionable"
-
-#: camel/providers/imap/camel-imap-store.c:882
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Non foi posible crear o directorio %s: %s"
+msgid "No such folder %s"
+msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "Debe estar traballando conectado para completar esta operación"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Para almacenar correo local en directorios de correo tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Ficheiro mailbox estándar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Para almacenar correo local en formato estándar mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Ficheiros de correo con formato maildir de Qmail"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Para almacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Ficheiros de correo con formato maildir de Qmail"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Para almacenar correo local en directorios maildir de qmail"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raíz de almacenamento %s non é un camiño absoluto"
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O raíz de almacenamento %s non é un directorio regular."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "Os almacenamentos locais non teñen un inbox"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, 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:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resume de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, 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-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resume: motivo descoñecido"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4010,18 +4819,19 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contidos da mensaxe non válidos"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4031,14 +4841,14 @@ msgstr ""
 "Non é posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4048,22 +4858,29 @@ msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "non é un directorio maildir."
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Non foi posible crear o cartafol `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4071,11 +4888,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
@@ -4085,9 +4904,12 @@ msgstr "Non é posible abrir a caixa de correo temporal: %s"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4096,11 +4918,13 @@ msgstr ""
 "Non é posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
@@ -4145,81 +4969,100 @@ msgstr "O cartafol `%s' non está baleiro. Non borrado."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Resumindo cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Non foi posible abir o cartafol: %s: resumindo desde a posición %ld: %s"
+msgstr ""
+"Non foi posible abir o cartafol: %s: resumindo desde a posición %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Erro fatal do analizador de correo preto da posición %ld no cartafol %s"
+msgstr ""
+"Erro fatal do analizador de correo preto da posición %ld no cartafol %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non é posible resumir o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resume e o cartafol non concordan, mesmo logo de sincronizar"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
@@ -4234,40 +5077,94 @@ msgstr "`%s' non é un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir o camiño do directorio MH: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' non é un ficheiro regular."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "O cartafol `%s' non existe."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Os almacenamentos locais non teñen un inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Ficheiro local de correo %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Non foi posible pechar o cartafol orixe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fallo ao enviar o nome de usuario ao servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Non foi posible recibir a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format, fuzzy
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapaz de cargar o ficheiro grouplist para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format, fuzzy
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
 
@@ -4279,25 +5176,25 @@ msgstr "Novas USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este é um provedor para ler e enviar aos grupos de novas de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta opción autenticarase co servidor NNTP usando un contrasinal sen cifrar."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
@@ -4313,7 +5210,8 @@ msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
-msgstr "Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
+msgstr ""
+"Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
 
 #: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
@@ -4348,7 +5246,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s día(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4385,27 +5283,27 @@ msgid ""
 msgstr ""
 "Isto conectarase ó servidor POP e usará Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Non foi posible conectarse ó servidor: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Non foi posible conectarse ó servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4414,12 +5312,12 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Descoñecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4427,7 +5325,7 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Non se soporta o mecanismo de autenticación solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4436,13 +5334,13 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4497,131 +5395,136 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para entregar correo por conexión a un servidor de correo remoto usando SMTP.\n"
+msgstr ""
+"Para entregar correo por conexión a un servidor de correo remoto usando "
+"SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non recoñecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parámetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parámetro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 #, fuzzy
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensaxe de Axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio non dispoñible, pechando a canle de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo pedida exitosa, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non é local; re-enviarase a <camiño-de-reenvío>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "A acción de correo pedida non foi levada a cabo: caixa de correo non dispoñible"
+msgstr ""
+"A acción de correo pedida non foi levada a cabo: caixa de correo non "
+"dispoñible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acción pedida non foi levada a cabo: caixa de correo non dispoñible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Acción pedida abortada: erro ao procesar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; téntao con <camiño-de-reenvío>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
-msgstr "A acción pedida non foi levada a cabo: insuficiente almacenamento no sistema"
+msgstr ""
+"A acción pedida non foi levada a cabo: insuficiente almacenamento no sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "A acción pedida foi abortada: excedeu a asignación de almacenamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "A acción pedida non foi levada a cabo: nome de mailbox non permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comeza a entrada da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Fallo na transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Necesítase un contrasinal para a transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticación é feble de máis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Necesítase encriptación para o mecanismo de autenticación pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4632,317 +5535,235 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando a mensaxe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "A petición HELO expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Erro creando o obxecto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autenticación"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petición AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "A petición AUTH expirou: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticación do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "A petición MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "A petición RCPT TO expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A petición DATA expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "O envío de DATA expirou: rematando mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Erro na resposta DATA: rematando a mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petición RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "A petición QUIT expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Incluír un ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Incluír un ficheiro como anexo na mensaxe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
-msgid "Attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propiedades do anexo"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "Anexo Inline"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:699
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: composer/e-msg-composer.c:710
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erro gardando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:730
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erro cargando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:802
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"¿Gustaríalle usar o cartafol de borradores por defecto?"
-
-#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:866
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta mensaxe non foi enviada.\n"
-"\n"
-"¿Desexa gardar os cambios?"
-
-#: composer/e-msg-composer.c:891
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1017
-msgid "That file does not exist."
-msgstr "O ficheiro non existe."
-
-#: composer/e-msg-composer.c:1027
-msgid "That is not a regular file."
-msgstr "Non é un ficheiro normal."
-
-#: composer/e-msg-composer.c:1037
-msgid "That file exists but is not readable."
-msgstr "O ficheiro existe pero non se pode ler."
-
-#: composer/e-msg-composer.c:1047
-msgid "That file appeared accesible but open(2) failed."
-msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
-
-#: composer/e-msg-composer.c:1069
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"O ficheiro é moi longo (máis de 100K).\n"
-"¿Está seguro de querer inserilo?"
-
-#: composer/e-msg-composer.c:1090
-msgid "An error occurred while reading the file."
-msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
-msgid "Compose a message"
-msgstr "Compoñer unha mensaxe"
-
-#: composer/e-msg-composer.c:1825
-#, fuzzy
-msgid "Could not create composer window."
-msgstr "Non foi posible crear a fiestra do compositor"
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4950,7 +5771,138 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Incluír un ficheiro"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Gardar como..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Advertencia"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Incapaz de abrir o cartafol de borradores para esta conta.\n"
+"¿Gustaríalle usar o cartafol de borradores por defecto?"
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro de saída: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro de saída: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erro gardando mensaxes en: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Pine.\n"
+"¿Gústaríalle importalos a Evolution?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"¿Desexa gardar os cambios?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Inserir ficheiro de texto..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Compoñer unha mensaxe"
+
+#: composer/e-msg-composer.c:2351
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: composer/evolution-composer.c:359
 #, fuzzy
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4959,7 +5911,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade na compoñente de correo."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
@@ -4978,36 +5930,58 @@ msgid "calendar information"
 msgstr "información de axenda"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, fuzzy
+msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5015,270 +5989,67 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Non se pode inicializar o compoñente de Resume Executivo de Evolution."
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Erro lendo os datos:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-#, fuzzy
-msgid "File does not have a place for the services.\n"
-msgstr "O ficheiro non ten lugar para os servicios."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Pode seleccionar unha páxina HTML diferente para o fondo do Resume Executivo.\n"
-"\n"
-"Déixeo en branco para que apareza a asignada por defecto"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s coa aplicación por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s co navegador web por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar unha mensaxe de correo a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Trocar a vista de %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Pechar %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s para a dereita"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s á fileira anterior"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mover %s á seguinte fileira"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aparencia"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fondo:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O compoñente Resume Executivo non puido inicializar Bonobo.\n"
-"Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
-"significa que compilou Bonobo contra GOAD no canto de OAF."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Compoñente de Evolution para o resume Executivo"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fábrica para o compoñente de Resume Executivo de Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fábrica para o resume RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Resume RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fábrica para o compoñente bonobo de probas."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fábrica para o compoñente de probas."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Comprobar servicio bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Comprobar servicio"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Erro"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Actualizar automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Actualizar agora"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Actualizar cada"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "días"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Escolleu unha data non válida."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5288,7 +6059,7 @@ msgstr ""
 "que sexa cando se executa o filtro ou se\n"
 "abre o cartafolv."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5296,7 +6067,7 @@ msgstr ""
 "A data da mensaxe será comparada co momento\n"
 "que especifique aquí."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5307,28 +6078,36 @@ msgstr ""
 "\"hai unha semana\" por exemplo."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "unha hora relativa á hora actual"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
@@ -5353,8 +6132,8 @@ msgstr ""
 "Oops, esqueceu escoller un cartafol.\n"
 "Volva atrás e especifique un cartafol válido no que deixar o correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -5366,46 +6145,6 @@ msgstr "Introduza o URI do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar Filtros"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Editar CartafolesV"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Entrante"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Saínte"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Cartafoles Virtuais"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "cartafoles específicos namais"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Fontes de CartafolV"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "con todos os cartafoles remotos activos"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "con todos os cartafoles locais e cos remotos activos"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "con todos os cartafoles locais"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5415,7 +6154,7 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Proba"
 
@@ -5427,36 +6166,88 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sen_título"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "saínte"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Engadir"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Editar CartafolesV"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Entrante"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Saínte"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Cartafoles Virtuais"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "cartafoles específicos namais"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Fontes de CartafolV"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "con todos os cartafoles locais e cos remotos activos"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "con todos os cartafoles locais"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Asignar Cor"
 
 #: filter/libfilter-i18n.h:4
@@ -5532,90 +6323,91 @@ msgid "Expression"
 msgstr "Expresión"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Reenviar ó Enderezo"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "é"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "non é"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "A mensaxe foi recibida"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "A mensaxe foi enviada"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover ó cartafol"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "en ou despois"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "en ou antes"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Coincide expresión regular (regexp)"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Establecer Estado"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamaño"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "sona como"
@@ -5636,7 +6428,8 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
@@ -5656,7 +6449,7 @@ msgstr "Regras"
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:298
+#: filter/rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -5664,192 +6457,278 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuación"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importar"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Correo Electrónico"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Elm.\n"
+"¿Gustaríalle importalas a Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Correo de Elm"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Engadir Libro de Enderezos"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Netscape.\n"
+"¿Gústaríalle importalos a Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Preferencias..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Netscape.\n"
+"¿Gústaríalle importalos a Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Pine.\n"
+"¿Gústaríalle importalos a Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Correo de Pine"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Compoñente de evolution para manexar o correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Compoñente de correo de resume executivo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Compoñente de fábrica de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Fábrica para o compositor de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Fábrica para a compoñente Resume de Correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configuración do Correo"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propiedades..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modificar as propiedades do ficheiro"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 #, fuzzy
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
 
-#: mail/folder-browser.c:253
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades para \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Almacenar búsqueda como CartafolV"
 
-#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:86
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "CartafolV sobre o A_sunto"
 
-#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:84
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "CartafolV sobre o Au_tor"
 
-#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:85
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "CartafolV sobre os _Destinatarios"
 
-#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:83
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV sobre _Lista de Correo"
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtro sobre o As_unto"
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtro sobre o Au_tor"
 
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtro sobre os D_estinatarios"
 
-#: mail/folder-browser.c:585
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtro sobre a Lista de _Correo"
 
-#: mail/folder-browser.c:594
-msgid "_Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:108 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Responder a _Todos"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:97
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:611
-#, fuzzy
-msgid "Forward _inline"
-msgstr "Re-enviar inline"
-
-#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:42
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como _non Lida"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Mover ó cartafol.."
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Copiar ó cartafol..."
 
-#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:113
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Engadir Libro de Enderezos"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:641
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Desde Mensaxe"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtro sobre a Lista de Correo"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para \"%s\""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Compoñente de evolution para manexar o correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Compoñente de correo de resume executivo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Compoñente de fábrica de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Fábrica para o compositor de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Fábrica para a compoñente Resume de Correo."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Elm.\n"
-"¿Gustaríalle importalas a Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Correo de Elm"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -5867,26 +6746,6 @@ msgstr "Fábrica para importar correo de Outlook Express 4 a Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa ficheiros de Outlook Express a Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Netscape.\n"
-"¿Gústaríalle importalos a Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Pine.\n"
-"¿Gústaríalle importalos a Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Correo de Pine"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato de almacenamento actual:"
@@ -5922,37 +6781,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Non enchiches toda a información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de Contas de Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"¿Desexa gardar os cambios?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Desactivado"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Está seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Recuperar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Facer esta a miña conta por defecto"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "¿Está seguro de que quere borrar esta conta de novas?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Xestor de Contas de Evolution"
 
@@ -5980,7 +6871,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5992,7 +6883,7 @@ msgstr ""
 "recibir ou compoñer correo.\n"
 "¿Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6000,7 +6891,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -6009,11 +6900,11 @@ msgstr ""
 "Necesitas configurar transporte para o correo\n"
 "antes de poder compoñelo."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ningún método de envío de correo"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6021,37 +6912,45 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/mail-callbacks.c:353
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Ten que configurar unha identidade antes de poder enviar este correo."
 
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "O %s, %s escribiu:"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada:\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1155
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "¿Está seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1169
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6059,7 +6958,7 @@ msgstr ""
 "Só pode editar mensaxes gardadas\n"
 "no cartafol de Borrador."
 
-#: mail/mail-callbacks.c:1201
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6067,27 +6966,25 @@ msgstr ""
 "Só pode reenviar mensaxes\n"
 "no cartafol de Enviados."
 
-#: mail/mail-callbacks.c:1234 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "¿Sobrescribir ficheiro?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "¿Está seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1238 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Xa existe un ficheiro con ese nome.\n"
-"¿Sobrescribilo?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "A mensaxe foi recibida"
 
-#: mail/mail-callbacks.c:1282
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1284
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1399
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6096,43 +6993,54 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1448 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtros..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1495
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
-#: mail/mail-callbacks.c:1573
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
-
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
+msgstr ""
+"¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr "Introduza nome e enderezo de correo electrónico máis abaixo. Os campos \"opcionais\" non necesitan encherse, a non ser que desexe incluír esta información nas mensaxes que mande."
+msgstr ""
+"Introduza nome e enderezo de correo electrónico máis abaixo. Os campos "
+"\"opcionais\" non necesitan encherse, a non ser que desexe incluír esta "
+"información nas mensaxes que mande."
 
 #: mail/mail-config-druid.c:101
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
-msgstr "Introduza información sobre o servidor de correo entrante. Se non sabe qué clase de servidor usa, contacte co administrador do sistema ou co Provedor de Servicios de Internet."
+msgstr ""
+"Introduza información sobre o servidor de correo entrante. Se non sabe qué "
+"clase de servidor usa, contacte co administrador do sistema ou co Provedor "
+"de Servicios de Internet."
 
 #: mail/mail-config-druid.c:105
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
-msgstr "Introduza información sobre o protocolo do servidor de correo saínte. Se non sabe o protocolo que usa, contacte co administrador do sistema ou co Provedor de Servicios de Internet."
+msgstr ""
+"Introduza información sobre o protocolo do servidor de correo saínte. Se non "
+"sabe o protocolo que usa, contacte co administrador do sistema ou co "
+"Provedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:107
 msgid ""
@@ -6141,13 +7049,22 @@ msgid ""
 "will be grouped together to make an Evolution mail account. Please enter a "
 "name for this account in the space below. This name will be used for display "
 "purposes only."
-msgstr "Case rematou co proceso de configuración do correo. A identidade, servidor de correo entrante e método de transporte de correo saínte que introduciu serán agrupados para facer unha conta de correo de Evolution. Introduza un nome para esta conta no espacio de abaixo. Este nome só se usará co propósito de mostralo."
+msgstr ""
+"Case rematou co proceso de configuración do correo. A identidade, servidor "
+"de correo entrante e método de transporte de correo saínte que introduciu "
+"serán agrupados para facer unha conta de correo de Evolution. Introduza un "
+"nome para esta conta no espacio de abaixo. Este nome só se usará co "
+"propósito de mostralo."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Asistente de Contas de Evolution"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Detectar tipos soportados "
@@ -6157,34 +7074,64 @@ msgid " color"
 msgstr " cor"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Non está soportado asinar por este cifrado"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Información de Contas"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Xestión e Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Comprobar automaticamente se hai correo novo de cada"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redactar"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6200,165 +7147,281 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Cartafol Borradores:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Enderezo de Correo-E:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Activado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:43
 #, fuzzy
-msgid "Highlight citations with "
+msgid "Highlight citations with"
 msgstr "Resaltar citas con "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Í_ndice"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Facer esta a miña conta por defecto"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensaxes como \"Lidas\" despois de: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Camiño do binario PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Escoller unha cor"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "No_tas:"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Recibindo Opcións"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Seguridade"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Seleccionar o binario PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar mensaxes en formato HTML por defecto."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "O servidor require autenticación"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Sen Información"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Usar conexión segura (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6368,163 +7431,243 @@ msgstr ""
 "\n"
 "Preme en \"Seguinte\" para empezar. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segundos."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Non foi posible conectarse ó servidor POP en %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Non foi posible conectarse ó servidor POP en %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Non foi posible crear o directorio %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Non foi posible crear a fiestra do compositor"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualizador Externo"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:357
-#, c-format, fuzzy
+#: mail/mail-display.c:399
+#, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (vía %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizador Externo"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Cargado o contido da mensaxe"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Abrir ligazón no navegador"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Copiar localización (AMÁÑAME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Gardar como (AMÁÑAME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Copiar localización (AMÁÑAME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gardar como..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d segundos"
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Cargado o contido da mensaxe"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Enderezo de Correo-E:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder-A:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Para"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
 
-#: mail/mail-format.c:1065
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non está configurado."
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:1086
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1087
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Preme na icona para desencriptar."
 
-#: mail/mail-format.c:1177 mail/mail-format.c:1565
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1185 mail/mail-format.c:1573
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa autenticidade"
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:1798
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) válido no sitio \"%s\""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:1836
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Punteiro a sitio FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1841
+#: mail/mail-format.c:2107
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Parte externa do corpo mal formada."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Non existe o cartafol %s"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abrindo '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar o cartafol \"%s\" ó formato \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando o cartafol"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Pechando o cartafol actual"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Renomeando o cartafol antigo e abrindo"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creando un novo cartafol"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copiando as mensaxes"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6533,7 +7676,7 @@ msgstr ""
 "Non foi posible gardar metainformación do cartafol, seguramente\n"
 "non poderá abrir este cartafol nunca máis: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6541,7 +7684,17 @@ msgstr ""
 "Se non pode abrir máis esta caixa de correo, poida\n"
 "que teña que reparala a man."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Non podes copiar mensaxes deste cartafol de lixo."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurar %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6550,7 +7703,7 @@ msgstr ""
 "Erro mentres '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6559,105 +7712,105 @@ msgstr ""
 "Erro efectuando a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "¿Acepta?"
-
-#: mail/mail-mt.c:874
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Enviando a mensaxe"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1152
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Lixo"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurando o cartafol"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1563
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recibindo as mensaxes"
 
-#: mail/mail-ops.c:1573
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1647
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Gardando as mensaxes"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6666,12 +7819,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1739
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6680,11 +7828,11 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6693,232 +7841,200 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Buscar"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sen_título)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Múltiples Mensaxes"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Editar Mensaxe"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Editar Mensaxe"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Re-enviar"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Buscar"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Camiño:"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Cancelando ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Agardando ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Enviando"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "¡Mensaxe incompleta escrita na canalización!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Resume de Correo"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaxe reenviada)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sen asunto)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Mensaxe reenviada (sen asunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
-"%s<br><b>Asunto:</b> %s <br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Novo CArtafolV"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:60
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:66
-msgid "Reply to the sender of this message"
-msgstr "Responder ó autor desta mensaxe"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Responder a Todos"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:64
-msgid "Reply to all recipients of this message"
-msgstr "Responder a tódolos destinatarios desta mensaxe"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Re-enviar"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Re-enviar esta mensaxe"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:57
-msgid "Print the selected message"
-msgstr "Imprimir a mensaxe seleccionada"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Borrar esta mensaxe"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Anterior"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Mensaxe Previa"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seguinte"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Seguinte Mensaxe"
-
-#: mail/message-list.c:678
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:970
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Gardando as mensaxes"
+
+#: mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.c:1083
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1083
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:1084
-msgid "To"
-msgstr "Para"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartafol"
 
@@ -6946,15 +8062,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscribíndose do cartafol \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Xestionar Subscripcións"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Compoñente de Evolution para o resume Executivo"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Fábrica para o compoñente de Resume Executivo de Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Non se pode inicializar o compoñente de Resume Executivo de Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Citas"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Amosar citas..."
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Resume de Correo"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Instalación de Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Houbo un erro cargando o ficheiro da axenda."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erro cargando a axenda</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Seccións:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "A impresión da mensaxe fallou"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Limpar"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Desactivado"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_tas:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Existe"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mes"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "A máis baixa"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Proba"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "A máis baixa"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Amosar"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "A descrición contén"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Buscar de Novo"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "agora"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualizar agora"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "A descrición contén"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Correo Electrónico"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Correo electrónico principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Recibindo Correo"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Estado de autenticación descoñecido."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erro descoñecido"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Convida para a Reunión"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Sriña."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Vertical"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Lista de Correo"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Pechar esta fiestra"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Puntuación"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Amosar tarefas"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Pechar esta fiestra"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cabeceira"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "días"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Cousas por facer"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Cousas por facer"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Respondida"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Cartafoles"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Todas Atendidas"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Mostar cartafoles que comezan por:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Opcións de Vista"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Visualizar"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Venres"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Mércores"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " unha semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Programar\n"
+"Hora"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tarefas"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Limpar a selección"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "A shell de Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalles"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Cancelar Reunión"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Cartafoles especiais"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6962,29 +9519,25 @@ msgstr ""
 "Esta nova versión do Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal do Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para saír."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con éxito."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Semella que é a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6995,16 +9548,14 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Non se poden copiar os ficheiros a\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7015,7 +9566,16 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7026,21 +9586,58 @@ msgstr ""
 "directorio de Evolution. Móvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell.c:379
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Non se poden copiar os ficheiros a\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Non se pode activar o almacenamento local -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
 
-#: shell/e-shell.c:1249
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copiar ó cartafol"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
-"Isto significa probablemente que o compoñente %s se estragou."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mover ó cartafol"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Borrar despois de %s día(s)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrindo cartafol %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7049,15 +9646,15 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "O nome de cartafol indicado non é válido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7065,41 +9662,133 @@ msgstr ""
 "O tipo do cartafol seleccionado non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Ningún cartafol visualizado)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Escolla o ficheiro que quere importar a Evolution, e seleccione qué tipo de "
+"ficheiro é na lista.\n"
+"\n"
+"Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará facer o "
+"traballo por vostede."
 
-#: shell/e-shell-view.c:1184
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importando %s\n"
+"Importador non preparado.\n"
+"Agarda 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importando %s\n"
+"Importando obxecto %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Non hai importador capaz de manexar\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importando"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importando %s.\n"
+"Comezando %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Erro iniciando %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Erro cargando %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importando %s\n"
+"Importando obxecto 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automático"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nome do ficheiro:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tipo do ficheiro:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Seleccionar cartafol"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7109,23 +9798,88 @@ msgstr ""
 "en grupo para xestión de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir ó cartafol..."
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Erro gardando atallos."
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crear un novo grupo de atallos"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Traballar desconectado"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "Traballar desconectado"
+
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Ningún cartafol visualizado)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Non se pode activar o almacenamento local -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
+"Isto significa probablemente que o compoñente %s se estragou."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7134,119 +9888,202 @@ msgstr ""
 "¿Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Eliminar este Grupo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Abrir nunha Nova Fiestra"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activar este atallo"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Erro gardando atallos."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Barra de _Atallos"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non é válido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Función non implementada neste almacenamento"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operación non soportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non está soportado neste almacenamento"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vista"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Ver o cartafol seleccionado"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_leta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Calquera campo contén"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Servidor:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7260,105 +10097,6 @@ msgstr "Tipo do cartafol:"
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "A shell de Evolution."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Escolla o ficheiro que quere importar a Evolution, e seleccione qué tipo de ficheiro é na lista.\n"
-"\n"
-"Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará facer o traballo por vostede."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importando %s\n"
-"Importador non preparado.\n"
-"Agarda 5 segundos antes de tentalo de novo."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importando %s\n"
-"Importando obxecto %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Non hai importador capaz de manexar\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importando"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importando %s.\n"
-"Comezando %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Erro iniciando %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Erro cargando %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importando %s\n"
-"Importando obxecto 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automático"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nome do ficheiro:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Seleccionar un ficheiro"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tipo do ficheiro:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Preme en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -7381,26 +10119,36 @@ msgstr ""
 "Este asistente guiaráo no proceso de importar ficheiros\n"
 "externos a Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importar"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Non eliminar"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:83
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7422,7 +10170,7 @@ msgstr ""
 "Agardamos que desfrutes os resultados do noso duro traballo, ¡e\n"
 " estamos impacientes esperando a túa contribución!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7430,237 +10178,323 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:186
+#: shell/main.c:216
 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:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copiar a selección"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Buscar"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Cortar a selección"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Novo contacto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
-msgid "Previews the message to be printed"
-msgstr "Previsualiza a mensaxe que se vai imprimir"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Novas"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Previsualiza a axenda que se vai imprimir"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Seleccionar Todo"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Ver Todos"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Ver tódolos contactos"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contacto"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Seleccionar Todo"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Días"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Preferencias alternativas"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crear un novo Evento de todo o día"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear unha nova cita"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crear unha nova axenda"
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Día"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Ir para atrás no tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ir á _Data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Ir a _Hoxe"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir á hora actual"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Novo _Evento"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Abrir Axenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Ant"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nova Cita"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Imprimir Axenda"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimir esta Axenda"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gardar Como"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Información Requerida"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Gardar axenda como outra cousa distinta"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Amosar un día"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Hoxe"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Semana Lab_oral"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Citas"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Día"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Novo"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Abrir axenda"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Semana"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Pechar"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Pechar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra de Ferramentas Principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Previsualizar a Impresión"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configuración da Impresión"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimir este elemento"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Gardar e Pechar"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Gardar a cita e pechar a caixa de diálogo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Trocar a vista de %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opcións de páxina para a impresora actual"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Accións"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Ficheiro"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Eliminar..."
 
@@ -7673,27 +10507,12 @@ msgstr "Axuda"
 msgid "Print En_velope..."
 msgstr "_Configuración da Impresión..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprimir este elemento"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Gardar e Pechar"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de diálogo"
@@ -7710,877 +10529,1004 @@ msgstr "Ver a axuda online"
 msgid "Send _message to contact..."
 msgstr "Enviar unha _mensaxe ao contacto..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Acerca desta aplicación"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Acerca de..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Acció_ns"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Libro de enderezos... (AMÁÑAME)"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Limpar"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Gardar a tarefa e pechar a caixa de diálogo"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Co_rtar"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar contacto a outro..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Comproba_r Nomes (AMÁÑAME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar unha _mensaxe ao contacto..."
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Limpar"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Cancelar Reunión"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Limpar a selección"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Re-enviar como _AxendaV (AMÁÑAME)"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_iar ao Cartafol... (AMÁÑAME)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Re-enviar esta mensaxe"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copiar"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copiar a selección"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Solicitar\n"
+"Reunión"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Cortar"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Programar Reunión"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Cortar a selección"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "AMÁÑAME: Programar Reunión"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Accións"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Envorcar XML"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Envorcar a descrición Xml da Interface"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancelada"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimeiro Obxecto no Cartafol (AMÁÑAME)"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Gardar o ficheiro actual"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Re-en_viar (AMÁÑAME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Redactar"
 
-#: ui/evolution-event-editor.xml.h:23
+#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Re-enviar como _AxendaV (AMÁÑAME)"
+msgid "Compose _New Message"
+msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Ir ó elemento seguinte"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Ir ó elemento anterior"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Tarefa In_completa (AMÁÑAME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modificar as propiedades do ficheiro"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Baleirar _Lixo"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Se_guinte"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Pegar"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Pegar o contido do cartafol"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Xestionar _Subcripcións"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "An_terior"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Previsualizar a Impresión"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "_Configuración da Impresión..."
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Configuración da Impresión"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Gardar"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de diálogo"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Gardar o ficheiro actual"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor de Cartafoles Virtuais..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Programar Reunión"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtros..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Programar algunha clase de reunión"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Enviar _Mensaxe"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleccionar Todo"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleccionar todo"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Previsualizar"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar as opcións de páxina para a impresora actual"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_Petición de Tarefa (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Acerca de..."
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Pechar"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Agochar Mensaxes S_eleccionadas"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copiar"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Agochar Mensaxes _Borradas"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Depuración"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "A_xuda"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Obxecto (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Marcar Todas como L_idas"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Entrada de diario (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Derradeiro elemento no cartafol (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Enviar Menxaxe (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mover ao Cartafol ... (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleccionar _Todo"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Nota (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Seleccionar _Fío"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Pegar"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleccionar Todo"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Amosar _Todo"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Obxecto non Lido (AMÁÑAME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Engadir Servicio"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Engadir un novo servicio ao Resume Executivo"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crear unha nova mensaxe de correo"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Lista de mensaxes por fíos"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Preferencias do Resume Executivo..."
+#: ui/evolution-mail-list.xml.h:25
+#, fuzzy
+msgid "_Expunge"
+msgstr "_Limpar"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova Mensaxe"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Cartafol"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter Selección"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Cambiar as propiedades deste cartafol"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propiedades..."
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Redactar"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Lista de mensaxes por fíos"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Redactar unha nova mensaxe"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "_Configurar cartafol..."
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copiar a mensaxe a un novo cartafol"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder ó autor desta mensaxe"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear Cartafol _Virtual Desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Eliminar as mensaxes seleccionadas"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Mostrar todas as cabeceiras da mensaxe"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Editar Mensaxe"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder ó autor desta mensaxe"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "Editar a mensaxe actual"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Baleirar _Lixo"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Eliminar as mensaxes seleccionadas"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Expunge"
-msgstr "Limpar"
+msgid "Display the previous message"
+msgstr "Mensaxe Previa"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtro sobre _Lista de Correo"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtro sobre _Autor"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtro sobre _Destinatarios"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtro sobre o _Asunto"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borralas"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Esquecer _Contrasinais"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Re-enviar"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Re-enviar Como"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward inline"
-msgstr "Re-enviar inline"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Reenviar o correo seleccionado a alguén"
+msgid "Forward _Attached"
+msgstr "Re-enviar Como"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Reenviar esta mensaxe in-line coa túa, así podes editala"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Cabeceiras Completas"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Hide Deleted Messages"
-msgstr "Agochar Mensaxes Borradas"
+msgid "Forward _Inline"
+msgstr "Re-enviar inline"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Hide S_elected Messages"
-msgstr "Agochar Mensaxes S_eleccionadas"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Re-enviar inline"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Deleted Messages"
-msgstr "Agochar Mensaxes _Borradas"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenviar o correo seleccionado a alguén"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide _Read messages"
-msgstr "Agochar Mensaxes _Lidas"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenviar o correo seleccionado a alguén"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Invert Selection"
-msgstr "Inverter Selección"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Reenviar o correo seleccionado a alguén"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _Subcripcións"
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenviar o correo seleccionado a alguén"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark All as R_ead"
-msgstr "Marcar Todas como L_idas"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As Read"
-msgstr "Marcar como Lida"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Importante"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Marcar como _non Lida"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "Mover mensaxe a un novo cartafol"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr "Abrir nunha Nova Fiestra"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Seguinte"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleccionar _Fío"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print Preview of message..."
-msgstr "Previsualización da Impresión da mensaxe..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "Imprimir mensaxe na impresora"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Print message..."
-msgstr "Imprimir mensaxe..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redireccionar (AMÁÑAME: impleméntame)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Reply to all"
-msgstr "Responder a Todos"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:65
-msgid "Reply to sender"
-msgstr "Responder ó autor"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "F_ontes"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Imprimir mensaxe..."
 
-#: ui/evolution-mail.xml.h:68
-msgid "Save the message into a new file"
-msgstr "Gardar a mensaxe nun novo ficheiro"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Previsualización da Impresión"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleccionar _Todo"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "Seleccionar _Fío"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Responder a Todos"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Enviar unha resposta á persoa que che enviou esta"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "Mensaxe de servidor:"
 
-#: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Enviar unha única mensaxe en resposta a todo o correo seleccionado"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Gardar a mensaxe nun novo ficheiro"
 
-#: ui/evolution-mail.xml.h:75
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "_Cabeceiras Completas"
 
-#: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "Lista de mensaxes por fíos"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "A data ten que ser introducida no formato: %s"
+
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Incluír un ficheiro como anexo na mensaxe"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Recuperar"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "CartafolV sobre _Lista de Correo"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "View Raw Message Source"
-msgstr "Ver a Mensaxe en Fontes Crúas"
+msgid "VFolder on Se_nder..."
+msgstr "CartafolV sobre o Au_tor"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor de Cartafoles Virtuais..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "CartafolV sobre os _Destinatarios"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "CartafolV sobre o A_sunto"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Anexo"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copiar ó cartafol"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Limpar"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Filters..."
-msgstr "_Filtros..."
-
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Cartafol"
+msgid "_Forward Message"
+msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Í_ndice"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter Selección"
+msgid "_Message Display"
+msgstr "Mensaxes"
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Mail Message"
-msgstr "Enviar _Mensaxe"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Mover ó cartafol"
 
-#: ui/evolution-mail.xml.h:101
-msgid "_Mail Settings..."
-msgstr "_Preferencias de Correo..."
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Visualizar"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "Abrir Obxectos Seleccionados"
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Quoted"
-msgstr "No_tas:"
+msgid "_Re-send Message"
+msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "_Responder"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Resend Messages"
-msgstr "_Re-enviar Mensaxes"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zar Barras de Tarefas..."
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Save Message As..."
-msgstr "_Gardar Mensaxe Como..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizar"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizar barras de tarefas"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Pechar"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "_Por fíos"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vista"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Borrar todas as Ocurrencias"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar esta mensaxe con PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserir ficheiro de texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserir un ficheiro como texto dentro da mensaxe"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Asinar con PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gardar _Borrador"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Encriptar con PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Gardar no _cartafol... (AMÁÑAME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Gardar"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gardar Como"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Gardar _Borrador"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Gardar no cartafol..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Gardar o ficheiro actual"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Gardar a mensaxe nun cartafol específico"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar máis _Tarde"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar máis _tarde"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar a mensaxe en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar a mensaxe máis tarde"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar a mensaxe agora"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar esta mensaxe agora"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Amosar / agochar anexos"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Amosar _anexos"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Amosar anexos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa clave PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Asinar esta mensaxe coa súa clave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Trocar mostra do campo BCC"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Trocar mostra do campo CC"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Trocar mostra do selector de Deste"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Trocar mostra do campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Anexo"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Depuración"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Borrar"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir ficheiro de texto... (AMÁÑAME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Seguridade"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "A_xuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Engadir o cartafol á lista de cartafoles subscritos"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Cartafol"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Eliminar o cartafol da lista de cartafoles subscritos"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Desubscribir"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Asig_nar Tarefa (AMÁÑAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Buscar de Novo"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "_Solicitude de Reunión (AMÁÑAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Refacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Refacer a acción desfeita"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Substituír"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Substituír unha cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Responder a _Todos (AMÁÑAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "_Mandar Informe de Estado (AMÁÑAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "S_altarse a Ocurrencia (AMÁÑAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Gardar a tarefa e pechar a caixa de diálogo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Buscar novamente a mesma cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Buscar unha cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Desfacer"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nova Tarefa"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Desfacer a última acción"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Borrar a tarefa"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AMÁÑAME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Actualizar Lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcar como Completa (AMÁÑAME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Resposta (AMÁÑAME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Abrir Obxectos Seleccionados"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Borrar a tarefa"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Borrar a tarefa"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Gardar como outra cousa distinta"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferencias das Tarefas..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Tarefa"
 
@@ -8588,132 +11534,220 @@ msgstr "_Tarefa"
 msgid "About Evolution..."
 msgstr "Acerca do Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar Barras de Tarefas..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Cambiar as propiedades deste cartafol"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de tarefas"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copiar ó cartafol"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creando un novo cartafol"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Eliminar este atallo da barra de atallos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creando un novo cartafol"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Borrar este elemento"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visualizar un cartafol diferente"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Saír"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Fiestra do Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "_Atallo da barra do Evolution"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Iniciación"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importar un formato de ficheiro externo"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de Ferramentas Principal"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Abrir a mensaxe actual nunha nova fiestra"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Amosar información sobre o Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Posto"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mosta da barra de cartafoles"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mosta da barra de atallos"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Trocar mostra do selector de Deste"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uso do Xestor de Co_ntactos"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uso da _Axenda"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uso do Cliente de _Correo"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Traballar desconectado"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Accións"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (AMÁÑAME)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contacto (AMÁÑAME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importar ficheiro..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "Í_ndice"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mensaxe de correo"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mover"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Abrir..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Barra de _Atallos"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (AMÁÑAME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Traballar desconectado"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Preferencias de Correo..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Tarxetas de Enderezo"
 
 #: views/addressbook/galview.xml.h:2
@@ -8744,9 +11778,12 @@ msgstr "Mensaxes"
 msgid "With Category"
 msgstr "Coa Categoría"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8820,68 +11857,139 @@ msgstr "Hora do _final da reunión:"
 msgid "All Attendees"
 msgstr "Todas Atendidas"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B de %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoxe"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Lixo"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Fallo na transacción"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Novas"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erro descoñecido: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Outro"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contactos"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Gardar Búsqueda"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Búsqueda Avanzada"
 
-#: widgets/misc/e-filter-bar.c:317 widgets/misc/e-filter-bar.h:97
-msgid "Advanced ..."
-msgstr "Avanzadas..."
-
-#: widgets/misc/e-filter-bar.h:94
-msgid "Save As ..."
-msgstr "Gardar Como..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Ver Todos"
 
-#: widgets/misc/e-filter-bar.h:96
-msgid "Edit ..."
-msgstr "Editar..."
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzado..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8891,6 +11999,10 @@ msgstr "Información"
 msgid "Warning"
 msgstr "Advertencia"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erro"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pregunta"
@@ -8904,7 +12016,7 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Bus_car"
 
@@ -8927,3 +12039,673 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Preferencias alternativas"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferencias das Tarefas..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Compañía:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Como _Minitarxetas"
+
+#~ msgid "As _Table"
+#~ msgstr "Como unha _Táboa"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Non fomos capaces de abrir este libro de enderezos. Isto\n"
+#~ "significa que ou introduciches unha URI incorrecta, ou\n"
+#~ "que se tentou acceder a un servidor LDAP e o programa\n"
+#~ "non está compilado con soporte LDAP. Se introduciches\n"
+#~ "unha URI comproba que sexa correcta e volve introducila.\n"
+#~ "Senón, probablemente tentaches acceder a un servidor\n"
+#~ "LDAP. Se desexas poder usar LDAP, necesitarás baixar e\n"
+#~ "instalar OpenLDAP e recompilar e instalar Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir axenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gardar axenda"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro cargando a axenda:<br>Método non soportado"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "As alarmas saltan despois de"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activar adiando para"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
+
+#, fuzzy
+#~ msgid "Items Due Today:"
+#~ msgstr "Cousas esperadas para hoxe:"
+
+#, fuzzy
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Cousas aínda non esperadas"
+
+#, fuzzy
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Cousas aínda non esperadas:"
+
+#, fuzzy
+#~ msgid "Overdue Items:"
+#~ msgstr "Retrasar Cousas:"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "Rota de Tarefas"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo ata que se deba facer"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas Visuais"
+
+#~ msgid "Work week"
+#~ msgstr "Semana de traballo"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editar Tarefa"
+
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaxe colpleta"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcar a tarefa como completa"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Editar esta tarefa..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Editar Tarefa"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ir a Hoxe"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Compoñente actualizada con éxito."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "¡Non foi posible cargar o ficheiro da axenda!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "¡Non foi posible ler o ficheiro da axenda!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "¡Esta é unha resposta de alguén que non foi convidado!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "¡Non foi posible actualizar o almacenamento da axenda!"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "¡Non se puido borrar o compoñente da axenda!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Compoñente borrado con éxito."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Non se recoñece este tipo de compoñente de axenda."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Engadir á Axenda"
+
+#~ msgid " Tentative "
+#~ msgstr " Tentativa "
+
+#~ msgid "Update Calendar"
+#~ msgstr "Actualizar Axenda"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Enderezo ocupado"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Ocupadas: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Cancelar\n"
+#~ "Reunión"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizador:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Publicar\n"
+#~ "Evento"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Amosar un diálogo"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Básicos sobre Citas"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data de _comezo:"
+
+#~ msgid "Summary contains"
+#~ msgstr "O resume contén"
+
+#~ msgid "Comment contains"
+#~ msgstr "O comentario contén"
+
+#~ msgid "Has category"
+#~ msgstr "Ten a categoría"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Explorando cartafol IMAP"
+
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "O cartafol %s non é seleccionable"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "Anexo Inline"
+
+#~ msgid "Send as:"
+#~ msgstr "Enviar como:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro de sinatura %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Non é un ficheiro normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "O ficheiro existe pero non se pode ler."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O ficheiro é moi longo (máis de 100K).\n"
+#~ "¿Está seguro de querer inserilo?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro HTML:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "O ficheiro non ten lugar para os servicios."
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Pode seleccionar unha páxina HTML diferente para o fondo do Resume "
+#~ "Executivo.\n"
+#~ "\n"
+#~ "Déixeo en branco para que apareza a asignada por defecto"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s coa aplicación por defecto de GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s co navegador web por defecto de GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar unha mensaxe de correo a %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Pechar %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Mover %s para a esquerda"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a dereita"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s á fileira anterior"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s á seguinte fileira"
+
+#~ msgid "Appearance"
+#~ msgstr "Aparencia"
+
+#~ msgid "Background:"
+#~ msgstr "Fondo:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O compoñente Resume Executivo non puido inicializar Bonobo.\n"
+#~ "Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
+#~ "significa que compilou Bonobo contra GOAD no canto de OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fábrica para o resume RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fábrica para o compoñente bonobo de probas."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Fábrica para o compoñente de probas."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Comprobar servicio bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Comprobar servicio"
+
+#~ msgid "Update automatically"
+#~ msgstr "Actualizar automaticamente"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar ó Enderezo"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar o cartafol \"%s\" ó formato \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Pechando o cartafol actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando o cartafol antigo e abrindo"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiando as mensaxes"
+
+#~ msgid "Do you accept?"
+#~ msgstr "¿Acepta?"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "¡Mensaxe incompleta escrita na canalización!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaxe reenviada)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (sen asunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaxe reenviada (sen asunto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
+#~ "%s<br><b>Asunto:</b> %s <br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimir a mensaxe seleccionada"
+
+#~ msgid "Delete this message"
+#~ msgstr "Borrar esta mensaxe"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros de Evolution instalados con éxito."
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atallo"
+
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "View All"
+#~ msgstr "Ver Todos"
+
+#~ msgid "View all contacts"
+#~ msgstr "Ver tódolos contactos"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Días"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crear unha nova axenda"
+
+#~ msgid "Day"
+#~ msgstr "Día"
+
+#~ msgid "New _Event"
+#~ msgstr "Novo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Abrir Axenda"
+
+#~ msgid "Prev"
+#~ msgstr "Ant"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gardar axenda como outra cousa distinta"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir axenda"
+
+#~ msgid "About this application"
+#~ msgstr "Acerca desta aplicación"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Acció_ns"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Libro de enderezos... (AMÁÑAME)"
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Comproba_r Nomes (AMÁÑAME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_iar ao Cartafol... (AMÁÑAME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Envorcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Envorcar a descrición Xml da Interface"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimeiro Obxecto no Cartafol (AMÁÑAME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Re-en_viar (AMÁÑAME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Ir ó elemento seguinte"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir ó elemento anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Tarefa In_completa (AMÁÑAME)"
+
+#~ msgid "N_ext"
+#~ msgstr "Se_guinte"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Configuración da Impresión..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programar algunha clase de reunión"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_Petición de Tarefa (AMÁÑAME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Obxecto (AMÁÑAME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Entrada de diario (AMÁÑAME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Derradeiro elemento no cartafol (AMÁÑAME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Enviar Menxaxe (AMÁÑAME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mover ao Cartafol ... (AMÁÑAME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (AMÁÑAME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Obxecto non Lido (AMÁÑAME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Engadir Servicio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Engadir un novo servicio ao Resume Executivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crear unha nova mensaxe de correo"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Preferencias do Resume Executivo..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nova Mensaxe"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "_Configurar cartafol..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar a mensaxe a un novo cartafol"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "Limpar"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr ""
+#~ "Eliminar definitivamente todas as mensaxes etiquetadas para borralas"
+
+#, fuzzy
+#~ msgid "Forward inline"
+#~ msgstr "Re-enviar inline"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Reenviar esta mensaxe in-line coa túa, así podes editala"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Agochar Mensaxes Borradas"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Inverter Selección"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Marcar como Lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _non Lida"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaxe a un novo cartafol"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualización da Impresión da mensaxe..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir mensaxe na impresora"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redireccionar (AMÁÑAME: impleméntame)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Responder a Todos"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Responder ó autor"
+
+#~ msgid "S_ource"
+#~ msgstr "F_ontes"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Enviar unha resposta á persoa que che enviou esta"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Enviar unha única mensaxe en resposta a todo o correo seleccionado"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#, fuzzy
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver a Mensaxe en Fontes Crúas"
+
+#~ msgid "_Reply"
+#~ msgstr "_Responder"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gardar Mensaxe Como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Por fíos"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gardar no _cartafol... (AMÁÑAME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar a mensaxe agora"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir ficheiro de texto... (AMÁÑAME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Asig_nar Tarefa (AMÁÑAME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "_Solicitude de Reunión (AMÁÑAME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ 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"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Responder a _Todos (AMÁÑAME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Mandar Informe de Estado (AMÁÑAME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "S_altarse a Ocurrencia (AMÁÑAME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente a mesma cadea"
+
+#~ msgid "Search for a string"
+#~ msgstr "Buscar unha cadea"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a última acción"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcar como Completa (AMÁÑAME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Resposta (AMÁÑAME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Atallo da barra do Evolution"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzadas..."
+
+#~ msgid "Save As ..."
+#~ msgstr "Gardar Como..."