Sync for 0.14.

svn path=/trunk/; revision=13073

1 files changed, 2727 insertions, 1961 deletions

diff --git a/po/gl.po b/po/gl.po
index cc9a239805..cc32298afc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,11 +9,10 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
-#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-08-22 18:50-0400\n"
+"POT-Creation-Date: 2001-09-21 18:31-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"
@@ -31,11 +30,308 @@ msgstr "Fábrica para importar ficheiros GnomeCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros GnomeCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3595
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr "Arquivar como"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome Completo:"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+msgid "Primary"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#, fuzzy
+msgid "Prim"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr "Asistente"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+msgid "Business"
+msgstr "Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#, fuzzy
+msgid "Bus"
+msgstr "Ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+msgid "Callback"
+msgstr "Reincorporación"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+msgid "Company"
+msgstr "Compañía"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#, fuzzy
+msgid "Comp"
+msgstr "Copiar"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+msgid "Home"
+msgstr "Particular"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#, fuzzy
+msgid "Org"
+msgstr ""
+"\n"
+"Org: "
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+msgid "Mobile"
+msgstr "Móbil"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+msgid "Car"
+msgstr "Automóbil"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr "Fax do Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#, fuzzy
+msgid "Bus Fax"
+msgstr "Fax do Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr "Fax Particular"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+msgid "Business 2"
+msgstr "Traballo 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#, fuzzy
+msgid "Bus 2"
+msgstr "Ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+msgid "Home 2"
+msgstr "Particular 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr "RDSI"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr "Outro Fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr "Localizador (Pager)"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1611
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr "Correo Electrónico 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr "Correo Electrónico 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "Sitio Web"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Departamento"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#, fuzzy
+msgid "Off"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "Título"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr "Profesión"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Xestor"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#, fuzzy
+msgid "Man"
+msgstr "maio"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr "Sobrenome"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#, fuzzy
+msgid "Nick"
+msgstr "Sobrenome"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr "Cónxuxe"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Axenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "CALUri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr "URL libre-ocupada"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "FBUrl"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#, fuzzy
+msgid "Anniversary"
+msgstr "Ani_versario:"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "Birth Date"
+msgstr ""
+"\n"
+"Data de nacemento: "
+
+#: addressbook/backend/ebook/e-card-simple.c:103
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card.c:3566
 msgid ""
 "\n"
 "Name: "
@@ -43,7 +339,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "  Prefix:     "
@@ -51,7 +347,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3568
 msgid ""
 "\n"
 "  Given:      "
@@ -59,7 +355,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3569
 msgid ""
 "\n"
 "  Additional: "
@@ -67,7 +363,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3570
 msgid ""
 "\n"
 "  Family:     "
@@ -75,7 +371,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3571
 msgid ""
 "\n"
 "  Suffix:     "
@@ -83,7 +379,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "Birth Date: "
@@ -91,7 +387,7 @@ msgstr ""
 "\n"
 "Data de nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3596
 msgid ""
 "\n"
 "Address:"
@@ -99,7 +395,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -107,7 +403,7 @@ msgstr ""
 "\n"
 "  Apdo. de correos: "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Ext:         "
@@ -115,7 +411,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Street:      "
@@ -123,7 +419,7 @@ msgstr ""
 "\n"
 "  Rúa:         "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  City:        "
@@ -131,7 +427,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Region:      "
@@ -139,7 +435,7 @@ msgstr ""
 "\n"
 "  Rexión:      "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3603
 msgid ""
 "\n"
 "  Postal Code: "
@@ -147,7 +443,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3604
 msgid ""
 "\n"
 "  Country:     "
@@ -155,7 +451,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3617
 msgid ""
 "\n"
 "Delivery Label: "
@@ -163,7 +459,7 @@ msgstr ""
 "\n"
 "Etiqueda de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "Telephones:\n"
@@ -171,7 +467,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "Telephone:"
@@ -179,7 +475,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "E-mail:\n"
@@ -187,7 +483,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "E-mail:"
@@ -195,7 +491,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Mailer: "
@@ -203,7 +499,7 @@ msgstr ""
 "\n"
 "Cliente de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3684
 msgid ""
 "\n"
 "Time Zone: "
@@ -211,7 +507,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Geo Location: "
@@ -219,7 +515,7 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3696
 msgid ""
 "\n"
 "Business Role: "
@@ -227,7 +523,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3708
 msgid ""
 "\n"
 "Org: "
@@ -235,7 +531,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "  Name:  "
@@ -243,7 +539,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3710
 msgid ""
 "\n"
 "  Unit:  "
@@ -251,7 +547,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3711
 msgid ""
 "\n"
 "  Unit2: "
@@ -259,7 +555,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3712
 msgid ""
 "\n"
 "  Unit3: "
@@ -267,7 +563,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "  Unit4: "
@@ -275,7 +571,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "Categories: "
@@ -283,7 +579,7 @@ msgstr ""
 "\n"
 "Categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "Comment: "
@@ -301,7 +597,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3731
 msgid ""
 "\n"
 "Unique String: "
@@ -309,7 +605,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Public Key: "
@@ -317,12 +613,12 @@ msgstr ""
 "\n"
 "Clave pública: "
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4087
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Múltiples Mensaxes"
 
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4095
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Introduza o contrasinal %s"
@@ -331,36 +627,95 @@ msgstr "Introduza o contrasinal %s"
 #: 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:1100
+#: addressbook/conduit/address-conduit.c:1119
 #: addressbook/gui/component/addressbook-factory.c:48
 #: 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
+#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: addressbook/conduit/address-conduit.c:201
+#: addressbook/backend/pas/pas-backend-file.c:257
+#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#, fuzzy
+msgid "Searching..."
+msgstr "Buscar"
+
+#: addressbook/backend/pas/pas-backend-file.c:259
+#, fuzzy
+msgid "Loading..."
+msgstr "Agardando ..."
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:268
+#, fuzzy
+msgid "Error in search expression."
+msgstr ""
+"Erro executando a expresión de búsqueda: %s:\n"
+"%s"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:467
+#, fuzzy
+msgid "Connecting to LDAP server..."
+msgstr "Conectando ao servidor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:477
+#, fuzzy
+msgid "Unable to connect to LDAP server."
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:493
+#, fuzzy
+msgid "Waiting for connection to LDAP server..."
+msgstr "Conectando ao servidor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:862
+#, fuzzy
+msgid "Adding card to LDAP server..."
+msgstr "Conectando ao servidor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:959
+#, fuzzy
+msgid "Removing card from LDAP server..."
+msgstr "Cargando axenda..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1064
+msgid "Modifying card from LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1992
+msgid "Receiving LDAP search results..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1997
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:204
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:214
+#: addressbook/conduit/address-conduit.c:217
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:662
+#: addressbook/conduit/address-conduit.c:681
 #: 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:663
+#: addressbook/conduit/address-conduit.c:682
 #: 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"
 
-#: addressbook/conduit/address-conduit.c:695
-#: addressbook/conduit/address-conduit.c:698
+#: addressbook/conduit/address-conduit.c:714
+#: addressbook/conduit/address-conduit.c:717
 #, fuzzy
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo de pilot"
@@ -402,28 +757,35 @@ 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-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 #: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1048
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP server containing contact information"
+msgstr ""
+"Erro cargando a información do filtro:\n"
+"%s"
+
 #: addressbook/gui/component/addressbook-component.c:386
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
@@ -445,7 +807,7 @@ msgstr "Novo contacto"
 msgid "New Contact _List"
 msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:188
 msgid "Edit Addressbook"
 msgstr "Editar o Libro de Enderezos"
 
@@ -476,7 +838,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:151
+#: calendar/gui/dialogs/task-editor.c:172
 #, fuzzy
 msgid "Basic"
 msgstr "Base"
@@ -550,19 +912,20 @@ msgid "_Account name:"
 msgstr "Xestión e Contas"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: 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 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
 #: filter/filter.glade.h:9 mail/mail-config.glade.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -581,41 +944,41 @@ msgstr "Porto:"
 msgid "_Server name:"
 msgstr "Mensaxe de servidor:"
 
-#: addressbook/gui/component/addressbook-storage.c:138
+#: addressbook/gui/component/addressbook-storage.c:163
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:393
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:401
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "Autenticación"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 msgid "Email Address:"
 msgstr "Enderezo de Correo-E:"
 
-#: addressbook/gui/component/addressbook.c:418
+#: addressbook/gui/component/addressbook.c:425
 #, fuzzy
 msgid "Password:"
 msgstr "Contrasinal"
 
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:488
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:495
 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:493
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -623,45 +986,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:508
 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:642
+#: addressbook/gui/component/addressbook.c:649
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
-#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:650
 msgid "Name contains"
 msgstr "Nome contén"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:651
 msgid "Email contains"
 msgstr "Enderezo contén"
 
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:652
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Categorías"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/component/addressbook.c:883
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Categoría:"
 
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:925
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o Navegador de Cartafoles"
 
@@ -676,23 +1039,11 @@ msgid "(none)"
 msgstr "(Sen nome)"
 
 #: 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:1603
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr "Correo Electrónico 3"
-
 #: addressbook/gui/component/e-address-popup.c:579
 #, fuzzy
 msgid "Select an Action"
@@ -715,13 +1066,13 @@ msgstr "Editar o Libro de Enderezos"
 
 #: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:307
 msgid "Edit Contact Info"
 msgstr "Editar Información de Contacto"
 
 #: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:486
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
@@ -748,33 +1099,52 @@ 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:729
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
-#: shell/e-shortcuts-view.c:385
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:764
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Quitar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
 msgid "Remove All"
 msgstr "Quitar Todos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "Enviando Correo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#, fuzzy
+msgid "Edit Contact List"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#, fuzzy
+msgid "Unnamed Contact List"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#, c-format
+msgid "(%d not shown)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:507
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:487
-msgid "Unable to get local storage.  This should never happen."
+#: addressbook/gui/component/select-names/e-select-names.c:521
+msgid ""
+"Evolution is unable to get the addressbook local storage. This may have been "
+"caused by the evolution-addressbook component crashing. To help us better "
+"understand and ultimately resolve this problem, please send an e-mail to Jon "
+"Trowbridge <trow@ximian.com> with a detailed description of the "
+"circumstances under which this error occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:598
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -835,240 +1205,179 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Collaboration"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1241
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:156
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:177
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
 msgid "File A_s:"
 msgstr "Arquivar como:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "New phone type"
 msgstr "Novo tipo de teléfono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organización:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Phone Types"
 msgstr "Tipos de teléfono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#, fuzzy
+msgid "_Calendar Information:"
+msgstr "información de axenda"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Free/Busy Information:"
+msgstr "Información Requerida"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Manager's Name:"
 msgstr "Nome do _Xestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Mobile"
 msgstr "_Móbil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Nickname:"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_This is the mailing address"
 msgstr "_Este é o enderezo da lista de correo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Enderezo da páxina Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "¿Está seguro de que quere borrar esta conta?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "¿Borrar Contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:759
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr "Asistente"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr "Traballo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr "Traballo 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr "Fax do Traballo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr "Reincorporación"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr "Automóbil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-msgid "Company"
-msgstr "Compañía"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr "Particular 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr "Fax Particular"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr "Móbil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr "Outro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr "Outro Fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr "Localizador (Pager)"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1612
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#: addressbook/gui/contact-editor/e-contact-editor.c:2234
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non foi posible borrar o ficheiro de resume de cartafol `%s': %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
@@ -2265,161 +2574,68 @@ msgid "Advanced Search"
 msgstr "Búsqueda Avanzada"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: mail/mail-search.c:264
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-model.c:121
+#, fuzzy
+msgid "No cards"
+msgstr "Non Iniciada"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-model.c:124
+#, fuzzy
+msgid "1 card"
+msgstr "Imprimir Axenda"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+#, fuzzy, c-format
+msgid "%d cards"
+msgstr " %d segundos"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1373
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Abrir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Re-enviar Como"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
 msgid "Print Envelope"
 msgstr "Configuración da Impresión"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
 #: ui/evolution-tasks.xml.h:8
@@ -2428,7 +2644,7 @@ 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
+#: addressbook/gui/widgets/e-minicard.c:452
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Erro cargando %s"
@@ -2439,7 +2655,7 @@ msgid "Success"
 msgstr "Fontes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
 #: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Erro descoñecido"
@@ -2468,10 +2684,10 @@ msgid "Protocol not supported"
 msgstr "Operación non soportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -2501,139 +2717,88 @@ msgid "Error removing list"
 msgstr "Erro cargando %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1248
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "Erro lendo os datos:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-msgid "* Click here to add a contact *"
-msgstr "* Prema aquí para engadir un contacto *"
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-msgid "File As"
-msgstr "Arquivar como"
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Email"
-msgstr "Correo Electrónico"
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "* Click here to add a contact *"
+msgstr "* Prema aquí para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Assistant Phone"
 msgstr "Teléfono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "Business Phone"
 msgstr "Teléfono de Negocios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Callback Phone"
 msgstr "Teléfono de Reincorporación"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Home Phone"
 msgstr "Teléfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Car Phone"
 msgstr "Teléfono Automóbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Business Phone 2"
 msgstr "Teléfono Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Other Phone"
 msgstr "Outro Teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr "Sitio Web"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr "Oficina"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-msgid "Title"
-msgstr "Título"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr "Profesión"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr "Xestor"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr "Sobrenome"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr "Cónxuxe"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr "URL libre-ocupada"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-#, fuzzy
-msgid "Done."
-msgstr "Feito"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-#, 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"
@@ -2826,13 +2991,13 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "Fonte..."
 
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1092
 #, fuzzy
 msgid "Print cards"
 msgstr "Imprimir Axenda"
 
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimir Axenda"
@@ -2881,22 +3046,23 @@ 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fábrica para o compoñente da axenda de Evolution."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to create a component editor factory"
+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"
 msgstr "Servicio de notificación de alarma"
@@ -2969,74 +3135,63 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:629
 #, 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/alarm-queue.c:689
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:58
+#: calendar/gui/alarm-notify/alarm-queue.c:740
 #, c-format
 msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
-"Son (é) a(s) %s. O tempo Unix é agora %ld. Pensamos que che pode apetecer "
-"sabelo."
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:115
+#: calendar/gui/alarm-notify/notify-main.c:90
 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:414
+#: calendar/gui/calendar-commands.c:439
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:451
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:435
-#, fuzzy, c-format
-msgid "%d"
-msgstr "d"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -3044,110 +3199,110 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:442
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:677
 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."
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
 #: calendar/gui/e-calendar-table.c:307
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
 #: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
-#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1700
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
 #: calendar/gui/e-calendar-table.c:380
 #, fuzzy
 msgid "Free"
 msgstr "semana"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Completada"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
+#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
 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:842 e-util/e-time-utils.c:326
+#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:847
+#: calendar/gui/calendar-model.c:923
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3158,7 +3313,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3168,49 +3323,48 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1051
+#: 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:1092
+#: 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:1105
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Indefinida"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:49
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1702
 msgid "Recurring"
 msgstr "Recurrindo"
 
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1704
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
+#: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Non"
 
@@ -3247,46 +3401,46 @@ msgstr "Descrición:"
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:63
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
-#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
+#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:56
+#: calendar/gui/component-factory.c:68
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/component-factory.c:409
+#: calendar/gui/component-factory.c:600
 #, fuzzy
 msgid "New _Task"
 msgstr "Nova Tarefa"
@@ -3295,26 +3449,26 @@ msgstr "Nova Tarefa"
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosará a axenda"
 
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinatarios da mensaxe"
 
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Opcións de Vista"
 
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3323,28 +3477,30 @@ msgid "Alarm Repeat"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
 msgid "Message to Display"
 msgstr "Almacenamento da mensaxe"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
 msgid "Play sound:"
 msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 #, fuzzy
 msgid "Run program:"
 msgstr "Executar un programa"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid ""
+"This is an email reminder, but Evolution does not yet support this kind of "
+"reminders.  You will not be able to edit the options for this reminder."
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr ""
@@ -3366,104 +3522,101 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:303
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "%d días"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:305
 #, fuzzy
 msgid "1 day"
 msgstr " un día"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:308
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 week"
 msgstr " unha semana"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:313
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy
 msgid "1 hour"
 msgstr " unha hora"
 
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 minute"
 msgstr " un minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy
 msgid "1 second"
 msgstr " un segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:350
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:354
 #: 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:387
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:358
 msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:362
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
 #: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:380
 #, fuzzy
 msgid "before start of appointment"
 msgstr " antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:383
 #, fuzzy
 msgid "after start of appointment"
 msgstr " despois do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:393
 #, fuzzy
 msgid "before end of appointment"
 msgstr " antes da fin desta cita"
 
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:396
 #, fuzzy
 msgid "after end of appointment"
 msgstr " despois da fin desta cita"
@@ -3484,43 +3637,44 @@ msgstr "Data e hora"
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resume:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 #, fuzzy
 msgid "_Options..."
 msgstr "_Opcións"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "antes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "día(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "fin da cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "comezo da cita"
 
@@ -3573,7 +3727,7 @@ msgid "First day of wee_k:"
 msgstr "Primeiro día da semana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:955
 msgid "Friday"
 msgstr "Venres"
 
@@ -3588,7 +3742,7 @@ msgid "Minutes"
 msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:951
 msgid "Monday"
 msgstr "Luns"
 
@@ -3598,7 +3752,7 @@ msgid "O_verdue tasks:"
 msgstr "Retrasar Cousas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:956
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -3623,7 +3777,7 @@ msgid "Su_n"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:957
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3643,7 +3797,7 @@ msgid "Tas_ks due today:"
 msgstr "Cousas esperadas para hoxe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:954
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -3669,12 +3823,12 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:952
 msgid "Tuesday"
 msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:953
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -3821,59 +3975,59 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
 #, fuzzy
 msgid " (Completed "
 msgstr "Completada"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
 #, fuzzy
 msgid "Completed "
 msgstr "Completada"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
 #, fuzzy
 msgid "Due "
 msgstr "Cita Agardada"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:515
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:520
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:523
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:540
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3881,54 +4035,54 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1170
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:90
 #, 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:87
+#: calendar/gui/dialogs/delete-comp.c:93
 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:93
+#: calendar/gui/dialogs/delete-comp.c:99
 #, 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:96
+#: calendar/gui/dialogs/delete-comp.c:102
 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:102
+#: calendar/gui/dialogs/delete-comp.c:108
 #, 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:105
+#: calendar/gui/dialogs/delete-comp.c:111
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:120
+#: calendar/gui/dialogs/delete-comp.c:126
 #, 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/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:131
 #, 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/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:136
 #, 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'?"
@@ -3948,20 +4102,26 @@ msgstr "Eliminada"
 msgid "Enter Delegate"
 msgstr "Eliminada"
 
-#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:181
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:186
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:191
 msgid "Recurrence"
 msgstr "Recurrencia"
 
-#: calendar/gui/dialogs/event-editor.c:171
-#: calendar/gui/dialogs/event-editor.c:273
+#: calendar/gui/dialogs/event-editor.c:198
+#: calendar/gui/dialogs/event-editor.c:345
+#, fuzzy
+msgid "Scheduling"
+msgstr "_Programar Reunión"
+
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancelar Reunión"
@@ -4007,7 +4167,7 @@ msgid "Pu_blic"
 msgstr "Pú_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Amosar"
@@ -4025,186 +4185,107 @@ msgstr "Hora de _finalización:"
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
-msgid "Individual"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-#, fuzzy
-msgid "Group"
-msgstr "Nome do grupo:"
-
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-#, fuzzy
-msgid "Resource"
-msgstr "Orixe do papel:"
-
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Room"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-#, fuzzy
-msgid "Chair"
-msgstr "Presidir"
-
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
-msgid "Required Participant"
-msgstr "Participantes Requiridos"
-
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
-msgid "Optional Participant"
-msgstr "Participante Opcional"
-
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
-msgid "Non-Participant"
-msgstr "Non-Participante"
-
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
-#, fuzzy
-msgid "Needs Action"
-msgstr "Engadir acción"
-
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
-#, fuzzy
-msgid "Accepted"
-msgstr " Aceptar "
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-#, fuzzy
-msgid "Declined"
-msgstr " Rexeitar "
-
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
-
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
-#, fuzzy
-msgid "Delegated"
-msgstr "Eliminada"
-
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-#, fuzzy
-msgid "In Process"
-msgstr "En Progreso"
-
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:504
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:548
+#: calendar/gui/dialogs/meeting-page.c:583
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Teléfono Automóbil"
 
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:550
+#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:703
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:552
+#: calendar/gui/dialogs/meeting-page.c:583
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participante Opcional"
 
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:583
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Non-Participante"
 
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:661
 #, fuzzy
 msgid "Sent By:"
 msgstr "Enviada"
 
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:829
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Eliminar..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
 #, fuzzy
 msgid "Attendee"
 msgstr "Ocupada"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Prema aquí para engadir un contacto *"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
 msgid "Common Name"
 msgstr "Data na que se completa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated From"
 msgstr "Eliminada"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
 msgid "Delegated To"
 msgstr "Eliminada"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 #, fuzzy
 msgid "Language"
 msgstr "Xestor"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 #, fuzzy
 msgid "Member"
 msgstr "decembro"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Posto"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 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:85
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
@@ -4229,33 +4310,33 @@ msgstr "_Convidar Outros..."
 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
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:570
 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
+#: calendar/gui/dialogs/recurrence-page.c:924
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1080
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1088
 #, fuzzy
 msgid "th"
 msgstr "4º"
 
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1261
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -4355,7 +4436,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:897
+#: my-evolution/e-summary-preferences.c:910
 msgid "URL:"
 msgstr "URL:"
 
@@ -4367,8 +4448,8 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor.c:161
-#: calendar/gui/dialogs/task-editor.c:239
+#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:285
 #, fuzzy
 msgid "Assignment"
 msgstr "Asignada"
@@ -4447,29 +4528,30 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
+#: calendar/gui/e-week-view.c:3297 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:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
+#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
+#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -4494,6 +4576,7 @@ msgid "_Delete Selected Tasks"
 msgstr "Borrar a tarefa"
 
 #: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Prema aquí para engadir unha tarefa"
@@ -4502,54 +4585,50 @@ msgstr "Prema aquí para engadir unha tarefa"
 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
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:819
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Due Date"
 msgstr "Cita Agardada"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data de _finalización:"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posición xeográfica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
-#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "Tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL:"
 
@@ -4560,264 +4639,320 @@ 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:285 calendar/gui/e-day-view.c:1354
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
 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:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
-#: calendar/gui/print.c:759
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
+#: calendar/gui/print.c:765
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
-#: calendar/gui/print.c:761
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
+#: calendar/gui/print.c:767
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Novo Evento de día _completo"
 
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir á Data"
 
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Borrar Todas as Ocurrencias"
 
-#: calendar/gui/e-itip-control.c:617
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:649
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:674
+#, fuzzy, c-format
+msgid "<b>Description:</b> %s"
+msgstr "Descrición:"
+
+#: calendar/gui/e-itip-control.c:710
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:711
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Información Opcional"
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:715
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:716
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancelar Reunión"
 
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:721
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:725
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Reunión (AMÁÑAME)"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:730
 #, fuzzy, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
+msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Este é o enderezo da lista de correo"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:731
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancelar Reunión"
 
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:735
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Seleccionar un ficheiro"
 
-#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:821
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:741
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Editar Mensaxe"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:758
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:666
+#: calendar/gui/e-itip-control.c:759
 #, fuzzy
 msgid "Task Information"
 msgstr "Información"
 
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:763
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Rota de Tarefas"
 
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:768
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:769
 #, fuzzy
 msgid "Task Update"
 msgstr "foi posterior a"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:773
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:681
+#: calendar/gui/e-itip-control.c:774
 #, fuzzy
 msgid "Task Update Request"
 msgstr "_Petición de Tarefa (AMÁÑAME)"
 
-#: calendar/gui/e-itip-control.c:685
-#, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
-msgstr ""
+#: calendar/gui/e-itip-control.c:778
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "_Este é o enderezo da lista de correo"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:779
 #, fuzzy
 msgid "Task Reply"
 msgstr "Responder"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:783
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancelar Reunión"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:789
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/gui/e-itip-control.c:713
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Información Requerida"
 
-#: calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-itip-control.c:807
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Información Requerida"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:811
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:812
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL libre-ocupada"
 
-#: calendar/gui/e-itip-control.c:723
-#, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
-msgstr ""
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "_Este é o enderezo da lista de correo"
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:817
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL libre-ocupada"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimir Mensaxe"
 
-#: calendar/gui/e-itip-control.c:940
-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:889
+#, 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:908
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:1061
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "Non foi posible cargar o cursor\n"
+
+#: calendar/gui/e-itip-control.c:1063
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data Completada:"
 
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1107
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1115
+msgid "Attendee status ould not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy
+msgid "Attendee status updated\n"
+msgstr "Enderezo ocupado"
+
+#: calendar/gui/e-itip-control.c:1119
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1147
 #, 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.c:969
+#: calendar/gui/e-itip-control.c:1149
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Comp_leta:"
 
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data de envío"
 
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
 msgid "The item could not be sent!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:1380
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -4855,6 +4990,169 @@ msgstr "data-finalización"
 msgid "date-start"
 msgstr "data-comezo"
 
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:671
+#, fuzzy
+msgid "Group"
+msgstr "Nome do grupo:"
+
+#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:672
+#, fuzzy
+msgid "Resource"
+msgstr "Orixe do papel:"
+
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:673
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:686
+#, fuzzy
+msgid "Chair"
+msgstr "Presidir"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+msgid "Required Participant"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:688
+msgid "Optional Participant"
+msgstr "Participante Opcional"
+
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:689
+msgid "Non-Participant"
+msgstr "Non-Participante"
+
+#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
+#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+#, fuzzy
+msgid "Needs Action"
+msgstr "Engadir acción"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:716
+#, fuzzy
+msgid "Accepted"
+msgstr " Aceptar "
+
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:717
+#, fuzzy
+msgid "Declined"
+msgstr " Rexeitar "
+
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:719
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminada"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#, fuzzy
+msgid "In Process"
+msgstr "En Progreso"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:1936
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:345
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr "Fóra da Oficina"
+
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr "Sen Información"
+
+#: calendar/gui/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr "_Convidar Outros..."
+
+#: calendar/gui/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr "_Opcións"
+
+#: calendar/gui/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr "Amosar _Só as Horas de Traballo"
+
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr "Amozar sen _Zoom"
+
+#: calendar/gui/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr "_Actualizar Libres/Ocupadas"
+
+#: calendar/gui/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr "_<<"
+
+#: calendar/gui/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr "_Autoescoller"
+
+#: calendar/gui/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ">_>"
+
+#: calendar/gui/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr "_Tódalas Persoas e Recursos"
+
+#: calendar/gui/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr "Tódalas _Persoas e Un Recurso"
+
+#: calendar/gui/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr "Persoas _Requiridas"
+
+#: calendar/gui/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr "Persoas Requiridas e _Un Recurso"
+
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr "Hora do _inicio da reunión:"
+
+#: calendar/gui/e-meeting-time-sel.c:626
+msgid "Meeting _end time:"
+msgstr "Hora do _final da reunión:"
+
 #: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
@@ -4865,17 +5163,17 @@ msgstr "Non foi posible cargar as tarefas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova Cita..."
 
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1318
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1271
+#: calendar/gui/gnome-cal.c:1329
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
@@ -4937,210 +5235,215 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/print.c:422
+#: calendar/gui/main.c:92
+#, fuzzy
+msgid "Could not create the component editor factory"
+msgstr "Non foi posible crear a fábrica do servicio de notificacin de alarma"
+
+#: calendar/gui/print.c:423
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:429
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1827
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1847
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1858
 #, 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:1854
+#: calendar/gui/print.c:1866
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1873
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2214
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
+#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2331
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimir este elemento"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2412
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
@@ -5190,100 +5493,109 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:230
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:254
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:259
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:267
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:301
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:308
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:335
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:340
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:355
+#: calendar/pcs/query.c:367
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:372
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:396
+#: calendar/pcs/query.c:408
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:509
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:516
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:634
+#: calendar/pcs/query.c:646
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Erro de sintaxe nos parámetros ou argumentos"
 
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:651
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:658
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:675
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:717
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:729
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:805
+#: calendar/pcs/query.c:817
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:1008
+#: calendar/pcs/query.c:862
+#, fuzzy
+msgid "completed-before? expects 1 argument"
+msgstr "Erro de sintaxe nos parámetros ou argumentos"
+
+#: calendar/pcs/query.c:867
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:1155
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5335,12 +5647,12 @@ msgstr "Debe estar traballando conectado para completar esta operación"
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:643
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:652
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
@@ -5359,36 +5671,36 @@ msgstr "Fallo na mensaxe %d"
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:770
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:892
+#: camel/camel-filter-driver.c:900
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro analizando o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:906
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro executando o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro executando búsqueda por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5397,7 +5709,7 @@ msgstr ""
 "Non se pode analizar a expresión de búsqueda: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5406,16 +5718,16 @@ msgstr ""
 "Erro executando a expresión de búsqueda: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
 msgid "(match-all) requires a single bool result"
 msgstr "(coinciden-todas) require un único resultado booleano"
 
-#: camel/camel-folder-search.c:563
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
+#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inválido nos contidos do corpo, agardábase unha cadea"
 
@@ -5452,12 +5764,12 @@ 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
+#: camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Fallo ao tentar obter bloqueo usando fcntl(2): %s"
 
-#: camel/camel-lock.c:255
+#: camel/camel-lock.c:267
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo ao tentar obter bloqueo usando flock(2): %s"
@@ -5527,45 +5839,73 @@ msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
 #: camel/camel-pgp-context.c:518
-msgid "No plaintext to sign."
-msgstr "Non hai texto plano para asinar."
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to sign"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
-msgid "No password provided."
-msgstr "Non se indicou un contrasinal."
+#, fuzzy
+msgid "Cannot sign this message: no password provided"
+msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#, fuzzy, c-format
+msgid "Cannot sign this message: 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:693
-msgid "No plaintext to clearsign."
-msgstr "Non hai texto plano para asinar en claro."
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to clearsign"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
 #: camel/camel-pgp-context.c:886
-msgid "No plaintext to verify."
-msgstr "Non hai texto plano para verificar."
+#, fuzzy
+msgid "Cannot verify this message: no plaintext to verify"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
+
+#: camel/camel-pgp-context.c:892
+#, fuzzy, c-format
+msgid "Cannot verify this message: 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:903
-#, c-format
-msgid "Couldn't create temp file: %s"
+#, fuzzy, c-format
+msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1070
-msgid "No plaintext to encrypt."
-msgstr "Non hai texto plano para encriptar."
+#: camel/camel-pgp-context.c:1069
+#, fuzzy
+msgid "Cannot encrypt this message: no plaintext to encrypt"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: camel/camel-pgp-context.c:1096
-msgid "No recipients specified"
-msgstr "Non se especificaron destinatarios."
+#: camel/camel-pgp-context.c:1079
+#, fuzzy
+msgid "Cannot encrypt this message: no password provided"
+msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
+
+#: camel/camel-pgp-context.c:1086
+#, fuzzy, c-format
+msgid "Cannot encrypt this message: 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:1095
+#, fuzzy
+msgid "Cannot encrypt this message: no recipients specified"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
+
+#: camel/camel-pgp-context.c:1258
+#, fuzzy
+msgid "Cannot decrypt this message: no ciphertext to decrypt"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: camel/camel-pgp-context.c:1287
-msgid "No ciphertext to decrypt."
-msgstr "Non hai texto cifrado para desencriptar."
+#: camel/camel-pgp-context.c:1266
+msgid "Cannot decrypt this message: no password provided"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1273
+#, fuzzy, c-format
+msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
 
 #: camel/camel-provider.c:131
 #, c-format
@@ -5583,38 +5923,39 @@ 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:191
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "servicio %s para %s en %s"
 
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "Conexión Cancelada"
 
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, 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:256
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(máquina descoñecida)"
 
-#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
+#: camel/camel-remote-store.c:486
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
 #: camel/camel-sasl-anonymous.c:33
@@ -5730,7 +6071,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:492
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -5748,7 +6089,7 @@ msgstr "Estado de autenticación descoñecido."
 
 #: 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:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -5778,55 +6119,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilación da espresión regular: %s: %s"
 
-#: camel/camel-service.c:155
+#: 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:163
+#: 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:171
+#: 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:549
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:576
+#: 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:601
+#: 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:603
+#: 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:68
+#: camel/camel-session.c:76
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
 
-#: camel/camel-session.c:70
+#: camel/camel-session.c:78
 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:297 camel/camel-session.c:366
+#: camel/camel-session.c:322 camel/camel-session.c:391
 #, 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:483
+#: camel/camel-session.c:508
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5854,25 +6195,30 @@ msgstr "O ficheiro non existe."
 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
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, 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
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
 #, fuzzy
 msgid "Failed to decode message."
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
 msgstr ""
 
+#: camel/camel-store.c:273
+#, fuzzy
+msgid "Cannot create folder: Invalid operation on this store"
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
 #: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
@@ -5881,7 +6227,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5896,7 +6242,7 @@ msgstr ""
 "\n"
 "¿Desexa aceptar de todas maneiras?"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:353
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5920,17 +6266,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar a URL `%s'"
 
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:547
+#: camel/camel-vee-folder.c:641
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
 
-#: camel/camel-vtrash-folder.c:109
+#: camel/camel-vtrash-folder.c:106
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non podes copiar mensaxes deste cartafol de lixo."
 
@@ -5958,42 +6304,42 @@ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:190
+#: camel/providers/imap/camel-imap-folder.c:189
 #, 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:209
+#: camel/providers/imap/camel-imap-folder.c:208
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible cargar resume para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:272
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:435
+#: camel/providers/imap/camel-imap-folder.c:434
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Gardando as mensaxes"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1890
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1634
-#: camel/providers/imap/camel-imap-folder.c:1715
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1640
+#: camel/providers/imap/camel-imap-folder.c:1639
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Gardando as mensaxes"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1923
 #, fuzzy
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
@@ -6003,6 +6349,14 @@ msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Non foi posible abrir o directorio de caché: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:243
+#: camel/providers/imap/camel-imap-message-cache.c:299
+#: camel/providers/imap/camel-imap-message-cache.c:330
+#: camel/providers/imap/camel-imap-message-cache.c:362
+#, fuzzy, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "Fallo na mensaxe %d"
+
 #: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
@@ -6011,7 +6365,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:720
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -6035,7 +6389,8 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros a mensaxes novas de INBOX neste servidor"
 
 #: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAPv4"
+#, fuzzy
+msgid "IMAP"
 msgstr "IMAPv4"
 
 #: camel/providers/imap/camel-imap-provider.c:65
@@ -6047,28 +6402,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:463
+#: camel/providers/imap/camel-imap-store.c:515
 #, 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:473
+#: camel/providers/imap/camel-imap-store.c:525
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, 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:497
+#: camel/providers/imap/camel-imap-store.c:549
 #, 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:512
+#: camel/providers/imap/camel-imap-store.c:564
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:590
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6079,12 +6434,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:889
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1038
+#: camel/providers/imap/camel-imap-store.c:1090
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6093,37 +6448,46 @@ msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
 #: camel/providers/local/camel-local-provider.c:41
-msgid "For storing local mail in MH-like mail directories"
+#, fuzzy
+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:50
-msgid "Standard Unix mailbox file"
-msgstr "Ficheiro mailbox estándar de Unix"
+#, fuzzy
+msgid "Local delivery"
+msgstr "Cartafoles especiais"
 
 #: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
+#, fuzzy
+msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para almacenar correo local en formato estándar mbox"
 
 #: camel/providers/local/camel-local-provider.c:60
+#, fuzzy
+msgid "Apply filters to new messages in INBOX"
+msgstr "Aplicar filtros a mensaxes novas de INBOX neste servidor"
+
+#: camel/providers/local/camel-local-provider.c:66
 msgid "Qmail maildir-format mail files"
 msgstr "Ficheiros de correo con formato maildir de Qmail"
 
-#: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
+#: camel/providers/local/camel-local-provider.c:67
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories."
 msgstr "Para almacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:77
 #, fuzzy
-msgid "Unix mbox spool-format mail files"
-msgstr "Ficheiros de correo con formato maildir de Qmail"
+msgid "Standard Unix mbox spools"
+msgstr "mbox estándar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:71
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
-msgid "For storing local mail in standard Unix spool directories"
+msgid "For reading and storing local mail in standard mbox spool files."
 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
+#: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raíz de almacenamento %s non é un camiño absoluto"
@@ -6148,39 +6512,39 @@ msgstr "Os almacenamentos locais non teñen un inbox"
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:240
 #, 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:279
+#: camel/providers/local/camel-local-store.c:282
 #, 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:289
+#: camel/providers/local/camel-local-store.c:292
 #, 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:417
-#: camel/providers/local/camel-spool-summary.c:1153
+#: camel/providers/local/camel-local-summary.c:418
+#: camel/providers/local/camel-spool-summary.c:1158
 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:176
+#: camel/providers/local/camel-maildir-folder.c:181
 #, 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:201
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:206
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-maildir-folder.c:226
 #: camel/providers/local/camel-mbox-folder.c:328
 #: 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
+#: camel/providers/local/camel-spool-folder.c:537
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6189,19 +6553,19 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:206
 #: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:227
 #: 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:103
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -6211,14 +6575,14 @@ msgstr ""
 "Non é posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:110
 #: 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:114
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -6228,23 +6592,23 @@ msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: 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:166
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:331
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -6258,13 +6622,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
+#: camel/providers/local/camel-spool-folder.c:273
 #, 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:209
-#: camel/providers/local/camel-spool-folder.c:409
+#: camel/providers/local/camel-spool-folder.c:414
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
@@ -6277,9 +6641,9 @@ msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:344
 #: camel/providers/local/camel-mbox-folder.c:376
 #: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:548
-#: camel/providers/local/camel-spool-folder.c:580
-#: camel/providers/local/camel-spool-folder.c:593
+#: camel/providers/local/camel-spool-folder.c:553
+#: camel/providers/local/camel-spool-folder.c:585
+#: camel/providers/local/camel-spool-folder.c:598
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6289,12 +6653,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:581
+#: camel/providers/local/camel-spool-folder.c:586
 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:390
-#: camel/providers/local/camel-spool-folder.c:594
+#: camel/providers/local/camel-spool-folder.c:599
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
@@ -6340,17 +6704,20 @@ 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:249
-#: camel/providers/local/camel-spool-summary.c:379
+#: 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:936
 #, fuzzy
-msgid "Summarizing folder"
-msgstr "Resumindo cartafol"
+msgid "Storing folder"
+msgstr "Sincronizando cartafol"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
 #, fuzzy, c-format
-msgid "Could not open folder: %s: summarizing from position %ld: %s"
+msgid "Could not open folder: %s: %s"
 msgstr ""
-"Non foi posible abir o cartafol: %s: resumindo desde a posición %ld: %s"
+"Non é posible abrir o cartafol `%s':\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -6361,22 +6728,17 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
 #, fuzzy, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr "Non é posible resumir o cartafol: %s: %s"
-
-#: 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
-#, fuzzy
-msgid "Synchronizing folder"
-msgstr "Sincronizando cartafol"
+msgid "Cannot check folder: %s: %s"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
 #, fuzzy, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
+msgid "Could not open file: %s: %s"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -6390,8 +6752,8 @@ msgstr "Non é posible abrir a caixa de correo temporal: %s"
 #: 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
+#: camel/providers/local/camel-spool-summary.c:979
+#: camel/providers/local/camel-spool-summary.c:987
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resume e o cartafol non concordan, mesmo logo de sincronizar"
 
@@ -6402,14 +6764,14 @@ msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-spool-summary.c:767
+#: camel/providers/local/camel-spool-summary.c:772
 #, 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:635
 #: camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-spool-summary.c:1032
+#: camel/providers/local/camel-spool-summary.c:1037
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
@@ -6426,7 +6788,7 @@ 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
+#: camel/providers/local/camel-spool-summary.c:1111
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
@@ -6446,12 +6808,12 @@ 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
+#: camel/providers/local/camel-spool-folder.c:470
 #, 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
+#: camel/providers/local/camel-spool-store.c:133
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' non é un ficheiro regular."
@@ -6461,56 +6823,63 @@ msgstr "`%s' non é un ficheiro regular."
 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
+#: camel/providers/local/camel-spool-store.c:181
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#. 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-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Resumindo cartafol"
+
+#: camel/providers/local/camel-spool-summary.c:384
+#, fuzzy, 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"
+
 #: 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-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-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
+#: camel/providers/local/camel-spool-summary.c:789
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
 #, 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
+#: camel/providers/local/camel-spool-summary.c:822
 #, 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
+#: camel/providers/local/camel-spool-summary.c:852
+#: camel/providers/local/camel-spool-summary.c:870
+#: camel/providers/local/camel-spool-summary.c:882
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:941
+#, fuzzy, c-format
+msgid "Could not file: %s: %s"
+msgstr "Non foi posible cargar %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -6593,22 +6962,27 @@ msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/pop3/camel-pop3-folder.c:259
+#, fuzzy
+msgid "Expunging deleted messages"
+msgstr "Eliminar as mensaxes seleccionadas"
+
+#: camel/providers/pop3/camel-pop3-folder.c:335
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
+#: camel/providers/pop3/camel-pop3-folder.c:351
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:374
 #, c-format
 msgid "No message with uid %s"
 msgstr "Non existe a mensaxe con UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:378
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
@@ -6621,25 +6995,21 @@ msgstr "Almacenamento da mensaxe"
 msgid "Leave messages on server"
 msgstr "Deixar as mensaxes no servidor"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 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:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
-"recibir correo de certos provedores de correo web, e de sistemas de email "
-"propietarios."
+#: camel/providers/pop3/camel-pop3-provider.c:53
+#, fuzzy
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:70
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6647,7 +7017,7 @@ msgstr ""
 "Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
 "Esta é a única opción que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:80
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -6657,7 +7027,7 @@ msgstr ""
 "través do protocolo APOP. Pode que isto non funcione para tódolos usuarios, "
 "mesmo naqueles que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
@@ -6719,6 +7089,11 @@ msgstr ""
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, fuzzy, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "Resposta non agardada do servidor IMAP: %s"
+
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
@@ -6933,7 +7308,7 @@ msgstr "Non se pode enviar a mensaxe: enderezo do autor non definida."
 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:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -7009,33 +7384,33 @@ msgstr "A petición DATA expirou: %s: correo non enviado"
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 #, 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:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 #, 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:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petición RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, 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:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
@@ -7065,7 +7440,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
 msgid "attachment"
 msgstr "anexo"
 
@@ -7098,52 +7473,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:357
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:363
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 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:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7156,46 +7531,37 @@ msgstr ""
 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
+#: composer/e-msg-composer.c:676
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:858
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:867
 #, fuzzy
 msgid "Warning!"
 msgstr "Advertencia"
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:871
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:893
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:912
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:983
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7203,17 +7569,17 @@ 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:1043
+#: composer/e-msg-composer.c:1036
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1044
 #, 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:1057
+#: composer/e-msg-composer.c:1050
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7222,7 +7588,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1056
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7231,7 +7597,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1065
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7240,16 +7606,16 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1165
 #, fuzzy
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gústaríalle importalos a Evolution?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1313
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7259,30 +7625,30 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1320
+#, fuzzy
+msgid "Warning: Modified Message"
+msgstr "Mensaxes re-enviadas"
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1343
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1492
 #, fuzzy
 msgid "Insert File"
 msgstr "Inserir ficheiro de texto..."
 
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2404
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Non foi posible crear a fiestra do compositor"
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:349
 #, fuzzy
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -7291,11 +7657,15 @@ 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:374
+#: composer/evolution-composer.c:364
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
 
+#: data/evolution.desktop.in.h:1 shell/main.c:76
+msgid "Evolution"
+msgstr "Evolution"
+
 #: data/evolution.desktop.in.h:2
 #, fuzzy
 msgid "The Evolution groupware suite"
@@ -7349,83 +7719,104 @@ msgstr "Nome contén"
 msgid "Subject does not contain"
 msgstr "non contén"
 
-#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:240
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1531
-msgid "%m/%d/%Y"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:178
+#, fuzzy
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:183
+#, fuzzy
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:194
+#, fuzzy
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:198
+#, fuzzy
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:203
+#, fuzzy
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:208
+#, fuzzy
+msgid "%m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:213
+#, fuzzy
+msgid "%m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:218
+#, fuzzy
+msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
 #, 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:102 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:354
+#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
-#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
-#: widgets/misc/e-dateedit.c:1566
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
+#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
 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:108 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
-#: widgets/misc/e-dateedit.c:1563
+#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
+#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is the second-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:244
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:317
 #, fuzzy
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
-
-#. This is the third-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:248
-#, fuzzy
-msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
-
-#. This is the final-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:252
-#, fuzzy, c-format
-msgid "%x"
-msgstr "x"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:308
-#: 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"
-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:313
-#, 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:322
-#, fuzzy
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+msgid "%I %p"
+msgstr "%I:%M %p"
 
 #: filter/filter-datespec.c:80
 msgid "year"
@@ -7516,6 +7907,12 @@ msgstr "unha hora que especifique"
 msgid "a time relative to the current time"
 msgstr "unha hora relativa á hora actual"
 
+#. The dialog
+#: filter/filter-datespec.c:394
+#, fuzzy
+msgid "Select a time to compare against"
+msgstr "Seleccionar un ficheiro"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -7533,7 +7930,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -7547,11 +7944,11 @@ msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:452
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "Entón"
 
-#: filter/filter-filter.c:466
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "Engadir acción"
 
@@ -7563,8 +7960,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:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:809
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
+#: mail/mail-account-gui.c:820
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -7589,39 +7986,39 @@ msgstr ""
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:626
+#: filter/filter-rule.c:696
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:630
+#: filter/filter-rule.c:700
 msgid "Untitled"
 msgstr "Sen_título"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:717
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:735
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:739
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:744
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:755
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
 msgid "outgoing"
 msgstr "saínte"
 
@@ -7665,195 +8062,194 @@ msgstr "con todos os cartafoles locais e cos remotos activos"
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 #, fuzzy
 msgid "Assign Color"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar Puntuación"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Anexos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contén"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar ó cartafol"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepción"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "non contén"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "non remata en"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "non sona como"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "non empeza por"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "remata en"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "é"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "é maior que"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "non é"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "A mensaxe foi recibida"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "A mensaxe foi enviada"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover ó cartafol"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "en ou despois"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "en ou antes"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Coincide expresión regular (regexp)"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:26 mail/mail-callbacks.c:1075
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamaño"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "sona como"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Cabeceira específica"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "comeza por"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "contén"
-
-#: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "non contén"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "non remata en"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "non sona como"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "non empeza por"
-
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "remata en"
-
-#: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "non é"
-
-#: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "en ou despois"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "en ou antes"
-
-#: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "sona como"
-
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "comeza por"
-
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi posterior a"
@@ -7870,7 +8266,7 @@ msgstr "Regras"
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:301
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -7878,23 +8274,48 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuación"
 
-#: filter/vfolder-rule.c:198
+#: filter/vfolder-rule.c:203
 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:816 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Importar"
+#: importers/elm-importer.c:96
+#, fuzzy
+msgid "Evolution is importing your old Elm mail"
+msgstr "Compoñente de evolution para manexar o correo."
+
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:102
+#, fuzzy
+msgid "Importing..."
+msgstr "Importando"
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:104
+#, fuzzy
+msgid "Please wait"
+msgstr "remata en"
+
+#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/pine-importer.c:369
+#, fuzzy, c-format
+msgid "Importing %s as %s"
+msgstr ""
+"Importando %s.\n"
+"Comezando %s"
+
+#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/pine-importer.c:506
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Enviando \"%s\""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:821
-#: importers/pine-importer.c:632 mail/component-factory.c:96
+#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/pine-importer.c:669 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:548
 #, fuzzy
 msgid ""
 "Evolution has found Elm mail files\n"
@@ -7903,16 +8324,21 @@ 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/elm-importer.c:577
+msgid "Elm"
+msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:230
+#, fuzzy
+msgid "GnomeCard:"
+msgstr "Tarxeta: "
+
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
 #, fuzzy
 msgid "Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
 #, fuzzy
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -7921,12 +8347,26 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "¿Gústaríalle importalos a Evolution?"
 
-#: importers/netscape-importer.c:826
+#: importers/netscape-importer.c:107
+msgid "Evolution is importing your old Netscape data"
+msgstr ""
+
+#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#, fuzzy
+msgid "Scanning directory"
+msgstr "Explorando cartafol IMAP"
+
+#: importers/netscape-importer.c:906
+#, fuzzy
+msgid "Starting import"
+msgstr "Data de _comezo:"
+
+#: importers/netscape-importer.c:972
 #, fuzzy
 msgid "Settings"
 msgstr "Preferencias..."
 
-#: importers/netscape-importer.c:851
+#: importers/netscape-importer.c:993
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7934,7 +8374,11 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "¿Gústaríalle importalos a Evolution?"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:101
+msgid "Evolution is importing your old Pine data"
+msgstr ""
+
+#: importers/pine-importer.c:695
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7942,9 +8386,10 @@ 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"
+#: importers/pine-importer.c:723
+#, fuzzy
+msgid "Pine"
+msgstr "Imprimir"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
@@ -7973,14 +8418,10 @@ 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
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Mail configuration interface"
 msgstr "Configuración do Correo"
@@ -7990,35 +8431,49 @@ msgstr "Configuración do Correo"
 msgid "Folder containing mail"
 msgstr "CartafolV sobre a Lista de Correo"
 
+#: mail/component-factory.c:97
+msgid "Mail storage folder (internal)"
+msgstr ""
+
+#: mail/component-factory.c:98
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Cartafoles Virtuais"
+
+#: mail/component-factory.c:98
+#, fuzzy
+msgid "Virtual Trash folder"
+msgstr "Cartafoles Virtuais"
+
 #: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:341
+#: mail/component-factory.c:356
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propiedades..."
 
-#: mail/component-factory.c:341
+#: mail/component-factory.c:356
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades do ficheiro"
 
-#: mail/component-factory.c:757
+#: mail/component-factory.c:790
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:757
+#: mail/component-factory.c:790
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:789
+#: mail/component-factory.c:821
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:928
+#: mail/component-factory.c:1007
 #, fuzzy
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
@@ -8032,135 +8487,165 @@ msgstr "Propiedades para \"%s\""
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:236 mail/mail-display.c:281
+#: mail/folder-browser.c:239 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/folder-browser.c:909
+#: mail/folder-browser.c:708
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/folder-browser.c:711 mail/folder-browser.c:716
+#: mail/folder-browser.c:720
+msgid ", "
+msgstr ""
+
+#: mail/folder-browser.c:712
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/folder-browser.c:717
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Eliminada"
+
+#: mail/folder-browser.c:722
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d segundos"
+
+#: mail/folder-browser.c:724
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/folder-browser.c:958
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Crear Filtro desde Mensaxe"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1303
 msgid "VFolder on _Subject"
 msgstr "CartafolV sobre o A_sunto"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1306
 msgid "VFolder on Se_nder"
 msgstr "CartafolV sobre o Au_tor"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1309
 msgid "VFolder on _Recipients"
 msgstr "CartafolV sobre os _Destinatarios"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1312
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV sobre _Lista de Correo"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1318
 msgid "Filter on Sub_ject"
 msgstr "Filtro sobre o As_unto"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1321
 msgid "Filter on Sen_der"
 msgstr "Filtro sobre o Au_tor"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1324
 msgid "Filter on Re_cipients"
 msgstr "Filtro sobre os D_estinatarios"
 
-#: mail/folder-browser.c:1278
+#: mail/folder-browser.c:1327
 msgid "Filter on _Mailing List"
 msgstr "Filtro sobre a Lista de _Correo"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Gardar Mensaxe Como..."
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:1293
+#: mail/folder-browser.c:1342
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1353
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1360
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Importante"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1367
 msgid "_Move to Folder..."
 msgstr "_Mover ó cartafol.."
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1369
 msgid "_Copy to Folder..."
 msgstr "_Copiar ó cartafol..."
 
-#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1378
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1383
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1338
+#: mail/folder-browser.c:1387
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Desde Mensaxe"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1538
 msgid "Filter on Mailing List"
 msgstr "Filtro sobre a Lista de Correo"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1539
 msgid "VFolder on Mailing List"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: mail/folder-browser.c:1499
+#: mail/folder-browser.c:1541
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1542
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV sobre a Lista de Correo (%s)"
@@ -8237,12 +8722,19 @@ msgstr "Editor de Contas de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:999
+#: mail/mail-account-gui.c:945
+#, fuzzy
+msgid "Could not save signature file."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
+
+#: mail/mail-account-gui.c:1022
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-account-gui.c:1005
+#: mail/mail-account-gui.c:1028
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8253,42 +8745,42 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: mail/mail-account-gui.c:1585
+#: mail/mail-account-gui.c:1611
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:145
+#: mail/mail-accounts.c:144
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:190
+#: mail/mail-accounts.c:189
 msgid "Disable"
 msgstr "Desactivado"
 
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:191
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:278
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Está seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:282
 #, fuzzy
 msgid "Don't delete"
 msgstr "Recuperar"
 
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:285
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Facer esta a miña conta por defecto"
 
-#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
 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 Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_Preferencias de Correo..."
@@ -8350,7 +8842,19 @@ msgstr ""
 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:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:231
+#, fuzzy
+msgid "Send anyway?"
+msgstr "Enviar unha mensaxe"
+
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8358,44 +8862,59 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:317
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:321
+#, fuzzy
+msgid "This message contains only Bcc recipients."
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
+
+#: mail/mail-callbacks.c:325
 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:339
+#: mail/mail-callbacks.c:419
+msgid "This message contains invalid recipients:"
+msgstr ""
+
+#: mail/mail-callbacks.c:453
 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:390
+#: mail/mail-callbacks.c:549
 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:632
+#: mail/mail-callbacks.c:779
+#, fuzzy
+msgid "an unknown sender"
+msgstr "Erro descoñecido"
+
+#: mail/mail-callbacks.c:784
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:895
-msgid "Forwarded message:\n"
-msgstr "Mensaxe reenviada:\n"
-
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1162
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:997
+#: mail/mail-callbacks.c:1164
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1366
+#: mail/mail-callbacks.c:1538
 #, 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:1388
+#: mail/mail-callbacks.c:1560
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8403,7 +8922,7 @@ msgstr ""
 "Só pode editar mensaxes gardadas\n"
 "no cartafol de Borrador."
 
-#: mail/mail-callbacks.c:1422
+#: mail/mail-callbacks.c:1594
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8411,29 +8930,29 @@ msgstr ""
 "Só pode reenviar mensaxes\n"
 "no cartafol de Enviados."
 
-#: mail/mail-callbacks.c:1434
+#: mail/mail-callbacks.c:1606
 #, 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:1455
+#: mail/mail-callbacks.c:1627
 #, fuzzy
 msgid "No Message Selected"
 msgstr "A mensaxe foi recibida"
 
-#: mail/mail-callbacks.c:1540
+#: mail/mail-callbacks.c:1712
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1542
+#: mail/mail-callbacks.c:1714
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1864
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8441,12 +8960,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1721
+#: mail/mail-callbacks.c:1871
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: mail/mail-callbacks.c:1826
+#: mail/mail-callbacks.c:1976
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8455,20 +8974,20 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1986
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtros..."
 
-#: mail/mail-callbacks.c:1882
+#: mail/mail-callbacks.c:2032
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1928
+#: mail/mail-callbacks.c:2078
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
-#: mail/mail-callbacks.c:2012
+#: mail/mail-callbacks.c:2162
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8529,26 +9048,31 @@ msgstr ""
 "propósito de mostralo."
 
 #. set window title
-#: mail/mail-config-druid.c:558
+#: mail/mail-config-druid.c:570
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
+#: mail/mail-config.c:1486
+#, fuzzy
+msgid "Evolution Shortcuts"
+msgstr "_Atallo da barra do Evolution"
+
 #. right now, the URL always works basically as a matter of luck...
 #. * both IMAP and mbox spool stores have INBOX as their inbox folder
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1579
+#: mail/mail-config.c:1618
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "mbox"
 
-#: mail/mail-config.c:1809
+#: mail/mail-config.c:1851
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1880 mail/mail-config.c:1883
+#: mail/mail-config.c:1922 mail/mail-config.c:1925
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -8569,7 +9093,7 @@ msgstr "Conta"
 msgid "Account Information"
 msgstr "Información de Contas"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xestión e Contas"
 
@@ -8646,11 +9170,11 @@ msgstr ""
 msgid "Display"
 msgstr "Visualizar"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Borradores"
 
@@ -8692,7 +9216,7 @@ msgstr "Ficheiro de sinatura:"
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidade"
 
@@ -8776,7 +9300,7 @@ msgstr "Maildir de Qmail "
 msgid "Quoted"
 msgstr "No_tas:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recibindo Correo"
 
@@ -8810,7 +9334,7 @@ msgstr "Seleccionar un ficheiro"
 msgid "Select PGP binary"
 msgstr "Seleccionar o binario PGP"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
@@ -8819,7 +9343,7 @@ msgid "Sending Mail"
 msgstr "Enviando Correo"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Enviada"
 
@@ -8990,15 +9514,20 @@ msgstr "Ficheiro de sinatura:"
 msgid "_Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "description"
+msgstr "Descrición:"
+
+#: mail/mail-config.glade.h:117
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "seconds."
 msgstr "segundos."
 
@@ -9046,207 +9575,189 @@ msgstr "Non foi posible crear a fiestra do compositor"
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear a fiestra do compositor"
 
-#: mail/mail-display.c:222
+#: mail/mail-display.c:223
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:343
+#: mail/mail-display.c:329
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:406
+#: mail/mail-display.c:392
 #, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (vía %s)"
 
-#: mail/mail-display.c:410
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:417
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1055
+#: mail/mail-display.c:1053
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1515
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Abrir ligazón no navegador"
 
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1517
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Copiar localización (AMÁÑAME)"
 
-#: mail/mail-display.c:1415
+#: mail/mail-display.c:1519
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gardar como (AMÁÑAME)"
 
-#: mail/mail-display.c:1417
+#: mail/mail-display.c:1521
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gardar como..."
 
-#: mail/mail-folder-cache.c:147
-#, c-format
-msgid "%d new"
-msgstr ""
-
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
-msgid ", "
-msgstr ""
-
-#: mail/mail-folder-cache.c:154
-#, c-format
-msgid "%d hidden"
-msgstr ""
-
-#: mail/mail-folder-cache.c:161
-#, fuzzy, c-format
-msgid "%d selected"
-msgstr "Eliminada"
-
-#: mail/mail-folder-cache.c:170
-#, fuzzy, c-format
-msgid "%d unsent"
-msgstr " %d segundos"
-
-#: mail/mail-folder-cache.c:172
-#, c-format
-msgid "%d total"
-msgstr ""
-
-#: mail/mail-format.c:623
+#: mail/mail-format.c:627
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:676
+#: mail/mail-format.c:680
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:760
+#: mail/mail-format.c:764
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:860
 #, fuzzy
 msgid "Bad Address"
 msgstr "Enderezo de Correo-E:"
 
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:882 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:881
+#: mail/mail-format.c:885
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder-A:"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:888 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:887
+#: mail/mail-format.c:891
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1311
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non está configurado."
 
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1327
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1338
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1339
 msgid "Click icon to decrypt."
 msgstr "Preme na icona para desencriptar."
 
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1394
 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:1403
+#: mail/mail-format.c:1405
 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"
 
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2083
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2097
 #, 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:2080
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2131
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2139
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2144
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Parte externa do corpo mal formada."
 
-#: mail/mail-local.c:330
+#: mail/mail-local.c:547
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "Reconfigurando o cartafol"
+
+#: mail/mail-local.c:620
 #, fuzzy, c-format
-msgid "No such folder /%s"
-msgstr "Non existe o cartafol %s"
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s: %s"
+msgstr ""
+"Non foi posible gardar metainformación do cartafol, seguramente\n"
+"non poderá abrir este cartafol nunca máis: %s"
+
+#: mail/mail-local.c:676
+#, fuzzy, c-format
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: mail/mail-local.c:460
+#: mail/mail-local.c:722
 #, fuzzy, c-format
-msgid "Registering '%s'"
-msgstr "Abrindo '%s'"
+msgid "Cannot delete folder metadata %s: %s"
+msgstr ""
+"Non foi posible borrar o cartafol `%s':\n"
+"%s"
 
-#: mail/mail-local.c:748
+#: mail/mail-local.c:1052
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:869
+#: mail/mail-local.c:1067
 #, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
-"Non foi posible gardar metainformación do cartafol, seguramente\n"
-"non poderá abrir este cartafol nunca máis: %s"
 
-#: mail/mail-local.c:909
+#: mail/mail-local.c:1089
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9254,17 +9765,17 @@ msgstr ""
 "Se non pode abrir máis esta caixa de correo, poida\n"
 "que teña que reparala a man."
 
-#: mail/mail-local.c:1002
+#: mail/mail-local.c:1180
 #, 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:1013
+#: mail/mail-local.c:1190
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Configurar %s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:188
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9273,7 +9784,7 @@ msgstr ""
 "Erro mentres '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:191
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9283,129 +9794,138 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:439
+#: mail/mail-mt.c:454
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:511
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Introduza o contrasinal %s"
+
+#: mail/mail-mt.c:514
+#, fuzzy
+msgid "Enter Password"
+msgstr "Introduza o contrasinal %s"
+
+#: mail/mail-mt.c:824
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Reconfigurando o cartafol"
 
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:229
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:482 mail/mail-ops.c:512
+msgid "However, the message was successfully sent."
+msgstr ""
+
+#: mail/mail-ops.c:549
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:668
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:687
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
+#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:823
+#: mail/mail-ops.c:782
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:878
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:993
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Lixo"
 
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-ops.c:1253
+#: mail/mail-ops.c:1215
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: mail/mail-ops.c:1395
-#, fuzzy, c-format
-msgid "Creating folder %s"
-msgstr "Abrindo cartafol %s"
-
-#: mail/mail-ops.c:1465
+#: mail/mail-ops.c:1353
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1552
+#: mail/mail-ops.c:1445
 #, fuzzy, c-format
-msgid "Synchronizing '%s'"
-msgstr "Sincronizando cartafol"
+msgid "Storing folder '%s'"
+msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Reconfigurando o cartafol"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1532
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1688
+#: mail/mail-ops.c:1581
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1648
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo as mensaxes"
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1734
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando as mensaxes"
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1846
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9414,7 +9934,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1874
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9423,11 +9943,11 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1948
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9436,12 +9956,12 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:1995
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
@@ -9455,64 +9975,85 @@ msgstr "_Buscar"
 msgid "(Untitled Message)"
 msgstr "(Sen_título)"
 
-#: mail/mail-search.c:237
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Múltiples Mensaxes"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:245
 #, fuzzy
 msgid "Empty Message"
 msgstr "Editar Mensaxe"
 
-#: mail/mail-search.c:288
+#: mail/mail-search.c:292
 #, fuzzy
 msgid "Find in Message"
 msgstr "Editar Mensaxe"
 
-#: mail/mail-search.c:318
+#: mail/mail-search.c:322
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:324
 #, fuzzy
 msgid "Search Forward"
 msgstr "Re-enviar"
 
-#: mail/mail-search.c:340
+#: mail/mail-search.c:344
 #, fuzzy
 msgid "Find:"
 msgstr "Buscar"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:347
 #, fuzzy
 msgid "Matches:"
 msgstr "Camiño:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:139
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancelando ..."
 
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
+#: mail/mail-send-recv.c:243
+#, fuzzy, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr ""
+
+#: mail/mail-send-recv.c:247
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipo:"
+
+#: mail/mail-send-recv.c:282
+#, fuzzy
+msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:283
+#, fuzzy
+msgid "Cancel All"
+msgstr "Cancelada"
+
+#: mail/mail-send-recv.c:333
 #, fuzzy
 msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
 #, fuzzy
 msgid "Waiting..."
 msgstr "Agardando ..."
 
-#: mail/mail-send-recv.c:494
+#: mail/mail-send-recv.c:518
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-session.c:182
+#: mail/mail-session.c:183
 msgid "User canceled operation."
 msgstr ""
 
@@ -9521,98 +10062,103 @@ msgstr ""
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:299
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:303
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-tools.c:471
+#: mail/mail-tools.c:439
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-vfolder.c:278
+#: mail/mail-vfolder.c:161
+#, fuzzy, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-vfolder.c:435
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:498
+#: mail/mail-vfolder.c:541
 msgid "New VFolder"
 msgstr "Novo CArtafolV"
 
-#: mail/message-browser.c:125
+#: mail/message-browser.c:121
 #, fuzzy
 msgid "(No subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/message-browser.c:127
+#: mail/message-browser.c:123
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mensaxe"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:640
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:641
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:642
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:643
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:644
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:648
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:649
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:653
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:654
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:911
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:920
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:932
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:938
+#: mail/message-list.c:942
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:2312
+#: mail/message-list.c:2331
 #, fuzzy
 msgid "Generating message list"
 msgstr "Gardando as mensaxes"
@@ -9630,37 +10176,37 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:221
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/subscribe-dialog.c:275
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscribíndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:277
+#: mail/subscribe-dialog.c:322
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscribíndose do cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartafol"
 
-#: mail/subscribe-dialog.c:1490
+#: mail/subscribe-dialog.c:1521
 #, fuzzy
 msgid "No server has been selected"
 msgstr "A mensaxe foi recibida"
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1582
 msgid "Please select a server."
 msgstr ""
 
@@ -9705,38 +10251,34 @@ msgstr "Desubscribir"
 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:30
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:141
+#: my-evolution/component-factory.c:139
 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:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:249
 #, fuzzy
 msgid "No appointments"
 msgstr "Amosar citas..."
 
-#: my-evolution/e-summary-calendar.c:236
+#: my-evolution/e-summary-calendar.c:286
 #, fuzzy
-msgid "%l:%M%p"
-msgstr "%I:%M%p"
+msgid "%k%M %d %B"
+msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:238
+#: my-evolution/e-summary-calendar.c:288
 #, fuzzy
-msgid "%a %l:%M%p"
-msgstr "%I:%M %p"
+msgid "%l:%M %d %B"
+msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:111
+#: my-evolution/e-summary-mail.c:115
 #, fuzzy
 msgid "Mail summary"
 msgstr "Resume de Correo"
@@ -9746,84 +10288,85 @@ msgstr "Resume de Correo"
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
 #: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:615
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:428
+#: my-evolution/e-summary-preferences.c:427
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:450
+#: my-evolution/e-summary-preferences.c:449
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:890
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:885
+#: my-evolution/e-summary-preferences.c:898
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:902
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1421
+#: my-evolution/e-summary-preferences.c:1438
 #, fuzzy
 msgid "Summary Settings"
 msgstr "O resume contén"
 
-#: my-evolution/e-summary-rdf.c:281
+#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
+#: my-evolution/e-summary-rdf.c:395
 #, 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>"
+msgid "Error downloading RDF"
 msgstr "<b>Erro cargando a axenda</b>"
 
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:487
 #, fuzzy
 msgid "News Feed"
 msgstr "_Novo Cartafol"
 
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:216
 #, fuzzy
 msgid "No tasks"
 msgstr "Amosar tarefas"
 
+#: my-evolution/e-summary-tasks.c:255
+#, fuzzy
+msgid "(No Description)"
+msgstr "Descrición:"
+
 #: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:324
+#: my-evolution/e-summary-weather.c:334
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:524
 #, fuzzy
 msgid "Weather"
 msgstr "Outro"
 
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:676
 #, fuzzy
 msgid "Regions"
 msgstr "Seccións:"
 
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:162
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "_Resume"
 
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:558
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "A impresión da mensaxe fallou"
@@ -11107,87 +11650,87 @@ msgid "One w_eek"
 msgstr " unha semana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
+msgid "Refresh _time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "S_how full path for folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Amosar tarefas"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Amosar tarefas"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "Tasks "
 msgstr "Tarefas"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "Units: "
 msgstr ""
 "\n"
 "  Unidade:  "
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Weather settings"
 msgstr "Limpar a selección"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_Display folders:"
 msgstr "Mostar cartafoles que comezan por:"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Display stations:"
 msgstr "Opcións de Vista"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Displayed feeds:"
 msgstr "Visualizar"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Five days"
 msgstr "Venres"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "_Mail"
 msgstr "Correo Electrónico"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_News Feeds"
 msgstr "_Novo Cartafol"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "_One day"
 msgstr "Mércores"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:28
 #, fuzzy
 msgid "_Schedule"
 msgstr ""
 "Programar\n"
 "Hora"
 
-#: my-evolution/my-evolution.glade.h:28
-#, fuzzy
-msgid "_Show full path for folders"
-msgstr "con todos os cartafoles remotos activos"
-
 #: my-evolution/my-evolution.glade.h:29
 #, fuzzy
 msgid "_Weather"
@@ -11206,32 +11749,32 @@ msgstr ""
 msgid "The Evolution shell."
 msgstr "A shell de Evolution."
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:200
 #, fuzzy
 msgid "Show Details"
 msgstr "Detalles"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:202
 #, fuzzy
 msgid "Cancel Operation"
 msgstr "Cancelar Reunión"
 
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
 #, fuzzy
 msgid "Inbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:176
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:593
+#: shell/e-local-storage.c:624
 #, fuzzy
 msgid "Local Folders"
 msgstr "Cartafoles especiais"
 
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
@@ -11252,16 +11795,7 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: 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: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:220
+#: shell/e-setup.c:193
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11272,14 +11806,14 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:235
+#: shell/e-setup.c:208
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: shell/e-setup.c:309
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11290,7 +11824,7 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:323
+#: shell/e-setup.c:296
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11299,7 +11833,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:348
+#: shell/e-setup.c:321
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11326,27 +11860,27 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:294
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:299
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copiar ó cartafol"
 
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:337
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:333
+#: shell/e-shell-folder-commands.c:342
 #, fuzzy
 msgid "Move folder"
 msgstr "Mover ó cartafol"
 
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:367
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11355,31 +11889,31 @@ msgstr ""
 "Non foi posible borrar o cartafol `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:374
+#: shell/e-shell-folder-commands.c:383
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Borrar despois de %s día(s)"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:459
+#: shell/e-shell-folder-commands.c:468
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Abrindo cartafol %s"
 
-#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:472
 #, fuzzy
 msgid "Rename"
 msgstr "Nome da regra: "
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
+#: shell/e-shell-folder-commands.c:480
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nome do cartafol:"
@@ -11393,11 +11927,30 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
+#: shell/e-shell-folder-creation-dialog.c:126
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Non se especificaron destinatarios."
+
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:137
+#, fuzzy
+msgid "Folder cannot contain the directory separator."
+msgstr "Non foi posible abrir o directorio de caché: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:180
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
 msgstr "O nome de cartafol indicado non é válido."
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:300
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
@@ -11413,11 +11966,11 @@ msgstr ""
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:102
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11433,7 +11986,7 @@ msgstr ""
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:197
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11444,7 +11997,7 @@ msgstr ""
 "Importador non preparado.\n"
 "Agarda 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11453,7 +12006,16 @@ msgstr ""
 "Importando %s\n"
 "Importando obxecto %d."
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:351
+#, fuzzy, c-format
+msgid "File %s does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#: shell/e-shell-importer.c:363
+msgid "You may only import to local folders"
+msgstr ""
+
+#: shell/e-shell-importer.c:378
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11462,11 +12024,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:388
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11475,17 +12037,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro iniciando %s"
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:428
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro cargando %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:445
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11494,57 +12056,72 @@ msgstr ""
 "Importando %s\n"
 "Importando obxecto 1."
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:515
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:566
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:571
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:581
 msgid "File type:"
 msgstr "Tipo do ficheiro:"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:645
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:624
+#: shell/e-shell-importer.c:646
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importar"
+
+#: shell/e-shell-offline-handler.c:562
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:144
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Wizard interface\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:153
+#: shell/e-shell-startup-wizard.c:168
 #, fuzzy
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: shell/e-shell-startup-wizard.c:558
+#: shell/e-shell-startup-wizard.c:582
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:561
+#: shell/e-shell-startup-wizard.c:585
 msgid "Starting Intelligent Importers"
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "De:"
+
+#: shell/e-shell-startup-wizard.c:745
+msgid ""
+"Please select the information\n"
+"that you would like to import"
+msgstr ""
+
 #: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
@@ -11553,13 +12130,19 @@ msgstr "Non se atopou o Bug buddy no seu $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
+#: shell/e-shell-view-menu.c:217
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
 #: shell/e-shell-view-menu.c:221
+#, fuzzy
 msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
@@ -11567,65 +12150,77 @@ msgstr ""
 "en grupo para xestión de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:424
 msgid "Go to folder..."
 msgstr "Ir ó cartafol..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:425
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:569
+#: shell/e-shell-view-menu.c:570
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:571
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:684
+#: shell/e-shell-view-menu.c:685
 #, fuzzy
 msgid "Work Online"
 msgstr "Traballar desconectado"
 
-#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Traballar desconectado"
 
-#: shell/e-shell-view.c:184
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(Ningún cartafol visualizado)"
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1478
 #, c-format
-msgid "%s - Evolution %s"
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:1480
+#, fuzzy
+msgid "(None)"
+msgstr "(Sen nome)"
+
+#: shell/e-shell-view.c:1485
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1461
-#, c-format
-msgid "%s - Evolution %s [%s]"
+#: shell/e-shell-view.c:1487
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1499
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1527
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1506
-msgid "Evolution is in the process of going offline."
+#: shell/e-shell-view.c:1534
+msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1512
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1540
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:509
+#: shell/e-shell.c:560
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1496
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11634,37 +12229,37 @@ msgstr ""
 "Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
 "Isto significa probablemente que o compoñente %s se estragou."
 
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1702
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Contidos da mensaxe non válidos"
 
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1704
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
 
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1706
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1708 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:75
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:76
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:176
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11673,100 +12268,111 @@ msgstr ""
 "¿Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:181
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:211
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:225
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:226
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:228
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:229
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:240
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:241
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:243
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:244
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:247
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:253
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:373
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
-msgid "Open in New Window"
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#, fuzzy
+msgid "Open in New _Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:387
 #, 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:383
+#: shell/e-shortcuts-view.c:390
+#, fuzzy
+msgid "_Rename"
+msgstr "Nome da regra: "
+
+#: shell/e-shortcuts-view.c:390
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:392
+#, fuzzy
+msgid "Re_move"
+msgstr "Quitar"
+
+#: shell/e-shortcuts-view.c:392
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
@@ -11774,7 +12380,7 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-shortcuts.c:1040
+#: shell/e-shortcuts.c:1044
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Barra de _Atallos"
@@ -11828,12 +12434,12 @@ msgstr "Non se atopou o cartafol indicado"
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:170
+#: shell/e-task-widget.c:192
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:197
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Comp_leta:"
@@ -11864,6 +12470,39 @@ msgstr "Tipo do cartafol:"
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "First Run Setup Assistant"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+#, fuzzy
+msgid "Importing Data"
+msgstr "Importando"
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Asistente"
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+#, fuzzy
+msgid "Timezone "
+msgstr ""
+"\n"
+"Zona horaria: "
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to the Evolution first run setup assistant\n"
+"\n"
+"This assistant will help you get started"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:13
+#, fuzzy
+msgid "Your configuration is complete."
+msgstr "Configuración do Correo"
+
 #: 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. "
@@ -11917,13 +12556,18 @@ msgstr "Non preguntar de novo"
 msgid "Evolution can import data from the following files:"
 msgstr "Compoñente de evolution para manexar o correo."
 
-#: shell/main.c:95
+#: shell/main.c:82
+#, fuzzy
+msgid "Evolution is now exiting ..."
+msgstr "_Preferencias de Correo..."
+
+#: shell/main.c:153
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
 "\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
 "places where features are either missing or only half working. \n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11950,33 +12594,34 @@ msgstr ""
 "Agardamos que desfrutes os resultados do noso duro traballo, ¡e\n"
 " estamos impacientes esperando a túa contribución!\n"
 
-#: shell/main.c:116
+#: shell/main.c:174
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
 msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:173
+#: shell/main.c:231
 #, fuzzy
-msgid "Cannot access the Evolution shell."
+msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:184
+#: shell/main.c:242
 #, fuzzy, c-format
-msgid "Cannot initialize the Evolution shell: %s"
+msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:228
+#: shell/main.c:286
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:229
+#: shell/main.c:287
 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:271
+#: shell/main.c:329
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
@@ -12097,34 +12742,34 @@ msgstr "_Contacto"
 msgid "_Contact List"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contactos..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ferramentas"
@@ -12251,12 +12896,12 @@ msgstr "_Citas"
 msgid "_Calendar Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Información Requerida"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:43
 #, fuzzy
 msgid "_Task..."
 msgstr "_Tarefa"
@@ -12279,7 +12924,7 @@ msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de Ferramentas Principal"
 
@@ -12296,14 +12941,13 @@ msgstr "Imprimir este elemento"
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
 msgstr "Gardar"
 
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
@@ -12322,7 +12966,7 @@ msgstr "Trocar a vista de %s"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -12331,7 +12975,7 @@ msgstr "_Ficheiro"
 msgid "Print En_velope..."
 msgstr "_Configuración da Impresión..."
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -12616,24 +13260,24 @@ msgstr "Eliminar as mensaxes seleccionadas"
 msgid "Threaded Message list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 #, fuzzy
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Cartafol"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverter Selección"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Lista de mensaxes por fíos"
@@ -12919,7 +13563,7 @@ msgstr "Responder a Todos"
 
 #: ui/evolution-mail-message.xml.h:70
 #, fuzzy
-msgid "S_earch Message"
+msgid "S_earch Message..."
 msgstr "Mensaxe de servidor:"
 
 #: ui/evolution-mail-message.xml.h:71
@@ -13033,7 +13677,7 @@ msgid "_Close"
 msgstr "_Pechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Vista"
 
@@ -13230,7 +13874,7 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -13319,12 +13963,13 @@ msgstr "Pegar o contido do cartafol"
 msgid "Tasks Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
 msgstr "_Tarefa"
 
 #: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#, fuzzy
+msgid "About Ximian Evolution..."
 msgstr "Acerca do Evolution..."
 
 #: ui/evolution.xml.h:2
@@ -13371,78 +14016,79 @@ msgid "E_xit"
 msgstr "_Saír"
 
 #: ui/evolution.xml.h:13
-#, fuzzy
-msgid "Evolution _FAQ"
-msgstr "Evolution"
-
-#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Fiestra do Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "Import an external file format"
 msgstr "Importar un formato de ficheiro externo"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution.xml.h:20
-#, fuzzy
-msgid "Open in New _Window"
+#: ui/evolution.xml.h:18
+msgid "Open in New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
+#: ui/evolution.xml.h:21
+#, fuzzy
+msgid "Show information about Ximian Evolution"
 msgstr "Amosar información sobre o Evolution"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Toggle"
 msgstr "Posto"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mosta da barra de cartafoles"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mosta da barra de atallos"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Trocar mostra do selector de Deste"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Ximian Evolution _FAQ"
+msgstr "Evolution"
+
 #: ui/evolution.xml.h:32
-msgid "_About Evolution..."
+#, fuzzy
+msgid "_About Ximian Evolution..."
 msgstr "_Acerca do Evolution..."
 
 #: ui/evolution.xml.h:34
@@ -13450,47 +14096,47 @@ msgstr "_Acerca do Evolution..."
 msgid "_Copy..."
 msgstr "_Copiar"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Import File..."
 msgstr "_Importar ficheiro..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_Move..."
 msgstr "Mover"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Traballar desconectado"
@@ -13576,81 +14222,6 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#. 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:394
-msgid "Out of Office"
-msgstr "Fóra da Oficina"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr "Sen Información"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Convidar Outros..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-msgid "_Options"
-msgstr "_Opcións"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
-msgid "Show _Only Working Hours"
-msgstr "Amosar _Só as Horas de Traballo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
-msgstr "Amozar sen _Zoom"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
-msgid "_Update Free/Busy"
-msgstr "_Actualizar Libres/Ocupadas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
-msgid "_Autopick"
-msgstr "_Autoescoller"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
-msgid "_All People and Resources"
-msgstr "_Tódalas Persoas e Recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
-msgstr "Tódalas _Persoas e Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
-msgid "_Required People"
-msgstr "Persoas _Requiridas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
-msgid "Required People and _One Resource"
-msgstr "Persoas Requiridas e _Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reunión:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reunión:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
-msgid "All Attendees"
-msgstr "Todas Atendidas"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista Actual"
@@ -13826,24 +14397,253 @@ msgstr "O Servidor Persoal do Libro de Enderezos"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "O Servidor Persoal da Axenda; axenda de fábrica"
 
-#: wombat/wombat.c:173
+#: wombat/wombat.c:175
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
 
-#: wombat/wombat.c:185
+#: wombat/wombat.c:187
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): non foi posible inicializar GNOME"
 
-#: wombat/wombat.c:198
+#: wombat/wombat.c:200
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#, fuzzy
+#~ msgid "Cannot open folder: %s: No such folder"
+#~ msgstr "Non é posible obter o cartafol: %s: %s"
+
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
+
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#, fuzzy
+#~ msgid "Done."
+#~ msgstr "Feito"
+
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Fábrica para o compoñente da axenda de Evolution."
+
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Recordatorio da cita en "
+
+#~ msgid "Snooze"
+#~ msgstr "Adiar"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "%d"
+#~ msgstr "d"
+
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "¡Non foi posible actualizar o ficheiro da axenda!\n"
+
+#~ msgid "No plaintext to sign."
+#~ msgstr "Non hai texto plano para asinar."
+
+#~ msgid "No password provided."
+#~ msgstr "Non se indicou un contrasinal."
+
+#~ msgid "No plaintext to clearsign."
+#~ msgstr "Non hai texto plano para asinar en claro."
+
+#~ msgid "No plaintext to verify."
+#~ msgstr "Non hai texto plano para verificar."
+
+#~ msgid "No plaintext to encrypt."
+#~ msgstr "Non hai texto plano para encriptar."
+
+#~ msgid "No ciphertext to decrypt."
+#~ msgstr "Non hai texto cifrado para desencriptar."
+
+#~ msgid "Standard Unix mailbox file"
+#~ msgstr "Ficheiro mailbox estándar de Unix"
+
+#, fuzzy
+#~ msgid "Unix mbox spool-format mail files"
+#~ msgstr "Ficheiros de correo con formato maildir de Qmail"
+
+#, fuzzy
+#~ msgid "Cannot summarize folder: %s: %s"
+#~ msgstr "Non é posible resumir o cartafol: %s: %s"
+
+#, fuzzy
+#~ msgid "Synchronizing folder"
+#~ msgstr "Sincronizando cartafol"
+
+#, fuzzy
+#~ msgid "Could not open folder to summarize: %s: %s"
+#~ msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
+
+#, fuzzy
+#~ msgid "Spool stores do not have an inbox"
+#~ msgstr "Os almacenamentos locais non teñen un inbox"
+
+#~ msgid "Could not open folder to summarise: %s: %s"
+#~ msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
+
+#~ msgid ""
+#~ "For connecting to POP servers. The POP protocol can also be used to "
+#~ "retrieve mail from certain web mail providers and proprietary email "
+#~ "systems."
+#~ msgstr ""
+#~ "Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
+#~ "recibir correo de certos provedores de correo web, e de sistemas de email "
+#~ "propietarios."
+
+#, fuzzy
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
+
+#, fuzzy
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%a %d/%m/%Y"
+
+#, fuzzy
+#~ msgid "%x"
+#~ msgstr "x"
+
+#~ msgid "Elm mail"
+#~ msgstr "Correo de Elm"
+
+#~ msgid "Pine mail"
+#~ msgstr "Correo de Pine"
+
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#~ msgid "Forwarded message:\n"
+#~ msgstr "Mensaxe reenviada:\n"
+
+#, fuzzy
+#~ msgid "No such folder /%s"
+#~ msgstr "Non existe o cartafol %s"
+
+#, fuzzy
+#~ msgid "Registering '%s'"
+#~ msgstr "Abrindo '%s'"
+
+#, fuzzy
+#~ msgid "Synchronizing '%s'"
+#~ msgstr "Sincronizando cartafol"
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Fábrica para o compoñente de Resume Executivo de Evolution."
+
+#, fuzzy
+#~ msgid "%l:%M%p"
+#~ msgstr "%I:%M%p"
+
+#, fuzzy
+#~ msgid "%a %l:%M%p"
+#~ msgstr "%I:%M %p"
+
+#, fuzzy
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "Houbo un erro cargando o ficheiro da axenda."
+
+#~ msgid "This seems to be the first time you are running Evolution."
+#~ msgstr "Semella que é a primeira vez que executa Evolution."
+
+#~ msgid "Please click \"OK\" to install the Evolution user files under"
+#~ msgstr ""
+#~ "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
+
+#~ msgid "All Attendees"
+#~ msgstr "Todas Atendidas"
+
 #~ msgid "RDF Summary"
 #~ msgstr "Resume RDF"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor LDAP"
-
 #~ msgid "Unknown addressbook type"
 #~ msgstr "Tipo de libro de enderezos descoñecido"
 
@@ -13896,15 +14696,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "FIXME Description help text here"
 #~ msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
 
-#~ msgid "Name"
-#~ msgstr "Nome:"
-
 #~ msgid "URI"
 #~ msgstr "URI"
 
-#~ msgid "Enter password for %s"
-#~ msgstr "Introduza o contrasinal %s"
-
 #, fuzzy
 #~ msgid "Category contains"
 #~ msgstr "Nome contén"
@@ -13975,10 +14769,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "The message is not understandable."
 #~ msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#, fuzzy
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "O cartafol parece estar corrompido sen recuperación posible."
-
 #~ msgid "All"
 #~ msgstr "Todas"
 
@@ -14136,10 +14926,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "_Tarefa (AMÁÑAME)"
 
 #, fuzzy
-#~ msgid "_My Evolution Settings..."
-#~ msgstr "_Preferencias de Correo..."
-
-#, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Preferencias alternativas"
 
@@ -14280,10 +15066,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Actualizar Axenda"
 
 #, fuzzy
-#~ msgid "Attendee address"
-#~ msgstr "Enderezo ocupado"
-
-#, fuzzy
 #~ msgid "Attendees: "
 #~ msgstr "Ocupadas: "
 
@@ -14310,18 +15092,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Appointment Basics"
 #~ msgstr "Básicos sobre Citas"
 
-#~ msgid "_Starting date:"
-#~ msgstr "Data de _comezo:"
-
 #~ 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"
 
@@ -14332,13 +15108,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ 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."
 
@@ -14748,9 +15517,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Reply (FIXME)"
 #~ msgstr "_Resposta (AMÁÑAME)"
 
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "_Atallo da barra do Evolution"
-
 #~ msgid "Advanced ..."
 #~ msgstr "Avanzadas..."