0.15.

svn path=/trunk/; revision=13289

1 files changed, 3473 insertions, 2673 deletions

diff --git a/po/gl.po b/po/gl.po
index 2a9ecdaf09..4ca55fd2d6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-09-02 01:16+0200\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -28,11 +28,308 @@ msgstr "Fábrica para importar ficheiros VCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros VCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr "Arquivar coma"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+msgid "Primary"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#, fuzzy
+msgid "Prim"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: 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:63
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: 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:63
+#: addressbook/backend/ebook/e-card-simple.c:68
+#, fuzzy
+msgid "Bus"
+msgstr "Ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+msgid "Callback"
+msgstr "Resposta"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+msgid "Company"
+msgstr "Compañía"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#, fuzzy
+msgid "Comp"
+msgstr "Copiar"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: 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:67
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#, fuzzy
+msgid "Org"
+msgstr ""
+"\n"
+"Org: "
+
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+msgid "Mobile"
+msgstr "Móbil"
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+msgid "Car"
+msgstr "Automóbil"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: 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:72
+#, fuzzy
+msgid "Bus Fax"
+msgstr "Fax do Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: 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:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+msgid "Business 2"
+msgstr "Traballo 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#, fuzzy
+msgid "Bus 2"
+msgstr "Ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+msgid "Home 2"
+msgstr "Particular 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: 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:77
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: mail/mail-config.glade.h:52
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: 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:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr "Buscapersoas"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: 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:81
+#: 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:82
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: 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:85
+#: 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:86
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "Sitio Web"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+msgid "Url"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Departamento"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Dep"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#, fuzzy
+msgid "Off"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "Título"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr "Profesión"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+msgid "Prof"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Xestor"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#, fuzzy
+msgid "Man"
+msgstr "maio"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Ass"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr "Alcume"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+#, fuzzy
+msgid "Nick"
+msgstr "Alcume"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr "Cónxuxe"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Axenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+msgid "CALUri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr "URL libre-ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "FBUrl"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#, fuzzy
+msgid "Anniversary"
+msgstr "Ani_versario:"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#, fuzzy
+msgid "Birth Date"
+msgstr ""
+"\n"
+"Data de Nacemento: "
+
+#: addressbook/backend/ebook/e-card-simple.c:102
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome Completo:"
+
+#: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3566
 msgid ""
 "\n"
 "Name: "
@@ -40,7 +337,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "  Prefix:     "
@@ -48,7 +345,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3568
 msgid ""
 "\n"
 "  Given:      "
@@ -56,7 +353,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3569
 msgid ""
 "\n"
 "  Additional: "
@@ -64,7 +361,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3570
 msgid ""
 "\n"
 "  Family:     "
@@ -72,7 +369,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3571
 msgid ""
 "\n"
 "  Suffix:     "
@@ -80,7 +377,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "Birth Date: "
@@ -88,7 +385,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3596
 msgid ""
 "\n"
 "Address:"
@@ -96,7 +393,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -104,7 +401,7 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Ext:         "
@@ -112,7 +409,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Street:      "
@@ -120,7 +417,7 @@ msgstr ""
 "\n"
 "  Rúa:         "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  City:        "
@@ -128,7 +425,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Region:      "
@@ -136,7 +433,7 @@ msgstr ""
 "\n"
 "  Rexión:      "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3603
 msgid ""
 "\n"
 "  Postal Code: "
@@ -144,7 +441,7 @@ msgstr ""
 "\n"
 "  Código Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3604
 msgid ""
 "\n"
 "  Country:     "
@@ -152,7 +449,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3649
+#: addressbook/backend/ebook/e-card.c:3617
 msgid ""
 "\n"
 "Delivery Label: "
@@ -160,7 +457,7 @@ msgstr ""
 "\n"
 "Etiqueta de Entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "Telephones:\n"
@@ -168,7 +465,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "Telephone:"
@@ -176,7 +473,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3688
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "E-mail:\n"
@@ -184,7 +481,7 @@ msgstr ""
 "\n"
 "Correo Electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "E-mail:"
@@ -192,7 +489,7 @@ msgstr ""
 "\n"
 "Correo Electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Mailer: "
@@ -200,7 +497,7 @@ msgstr ""
 "\n"
 "Cliente de Correo: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3684
 msgid ""
 "\n"
 "Time Zone: "
@@ -208,7 +505,7 @@ msgstr ""
 "\n"
 "Fuso Horario: "
 
-#: addressbook/backend/ebook/e-card.c:3724
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Geo Location: "
@@ -216,7 +513,7 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3728
+#: addressbook/backend/ebook/e-card.c:3696
 msgid ""
 "\n"
 "Business Role: "
@@ -224,7 +521,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3708
 msgid ""
 "\n"
 "Org: "
@@ -232,7 +529,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "  Name:  "
@@ -240,7 +537,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3710
 msgid ""
 "\n"
 "  Unit:  "
@@ -248,7 +545,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3711
 msgid ""
 "\n"
 "  Unit2: "
@@ -256,7 +553,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3712
 msgid ""
 "\n"
 "  Unit3: "
@@ -264,7 +561,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "  Unit4: "
@@ -272,7 +569,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "Categories: "
@@ -280,7 +577,7 @@ msgstr ""
 "\n"
 "Categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "Comment: "
@@ -298,7 +595,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:3731
 msgid ""
 "\n"
 "Unique String: "
@@ -306,7 +603,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Public Key: "
@@ -314,11 +611,11 @@ msgstr ""
 "\n"
 "Clave Pública: "
 
-#: addressbook/backend/ebook/e-card.c:4098
+#: addressbook/backend/ebook/e-card.c:4087
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/backend/ebook/e-card.c:4106
+#: addressbook/backend/ebook/e-card.c:4095
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -327,36 +624,95 @@ msgstr "VCard de %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:1167
 #: 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/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
+#: 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 M_ensaxe..."
+
+#: 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 ao executar a expresión de busca: %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 "Eliminando as tarxetas..."
+
+#: 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
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:663
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 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:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
@@ -397,42 +753,48 @@ msgid "Factory for the Addressbook's address popup"
 msgstr "Fábrica para o menú emerxente de enderezos 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 o control de exemplo do Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-component.c:68
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1061
+#: addressbook/gui/component/addressbook-component.c:66
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 msgid "Folder containing contact information"
 msgstr "Cartafol que contén información de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor NNTP:"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP server containing contact information"
+msgstr "Cartafol que contén información de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr "Novo C_ontacto"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr "Nova _Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:188
 msgid "Edit Addressbook"
 msgstr "Editar o Libro de Enderezos"
 
@@ -461,7 +823,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
 msgid "Basic"
 msgstr "Básico"
 
@@ -527,26 +889,29 @@ msgstr "Este e o porto que usa o servidor ldap."
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
-msgstr "Este nome hase empregar para identifica-la conta. Só se empregará para amosar."
+msgstr ""
+"Este nome hase empregar para identifica-la conta. Só se empregará para "
+"amosar."
 
 #: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "Nome da Cont_a:"
 
 #: 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:19
 #: 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:91 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-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
+#: 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:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -562,32 +927,32 @@ msgstr "_Porto:"
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/addressbook-storage.c:140
+#: addressbook/gui/component/addressbook-storage.c:163
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Introduza o seu enderezo de correo e contrasinal de acceso a %s"
 
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr "Autenticación LDAP"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/addressbook.c:418
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:502
 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:509
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -597,7 +962,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:493
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -609,7 +974,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -617,37 +982,37 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:642
+#: addressbook/gui/component/addressbook.c:663
 #: 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:664
 msgid "Name contains"
 msgstr "O nome contén"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "Enderezo contén"
 
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 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:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -661,23 +1026,11 @@ msgid "(none)"
 msgstr "(ningún)"
 
 #: 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:17
+#: 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
 msgid "Select an Action"
 msgstr "Escolla unha Acción"
@@ -698,13 +1051,13 @@ msgstr "Buscando no 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"
 
@@ -730,31 +1083,50 @@ msgstr ""
 "Fábrica para a interface 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:179
+#: 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 "Eliminar"
 
-#: 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 "Eliminar Todos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
 msgid "Send HTML Mail?"
 msgstr "¿Enviar Correo HTML?"
 
-#: 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 "Lista de _Contactos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#, fuzzy
+msgid "Unnamed Contact List"
+msgstr "Contacto Sen Nome"
+
+#: 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
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: 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 ""
-"Non foi posible obter armacenamento local. Isto nunca debeu ter pasado."
 
-#: 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 "Seleccionar Contactos do Libro de Enderezos"
 
@@ -809,118 +1181,141 @@ 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 "F_ree/Busy URL:"
+msgstr "URL libre-ocupado"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "Ar_quivar coma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 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:14
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "Organi_zación:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 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:18
 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:20
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 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:22
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: 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:1318 mail/mail-config.glade.h:94
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: 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:26
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "Nome _Completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Nome do _Administrador:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Móbil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Imprimir Axenda"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Enderezo da páxina _Web:"
 
@@ -936,117 +1331,33 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "¿Borrar Contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:759
 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 "Resposta"
-
-#: 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 "Buscapersoas"
-
-#: 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
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: 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:286
+#: 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:312
-#: 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:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
@@ -2173,114 +2484,6 @@ msgstr "Busca Avanzada"
 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/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:121
 msgid "No cards"
 msgstr "Sen tarxetas"
@@ -2296,9 +2499,9 @@ msgstr "%d tarxetas"
 
 #: 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:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
@@ -2309,18 +2512,18 @@ msgid "Open"
 msgstr "Abrir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:754
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:755
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: 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
@@ -2328,13 +2531,13 @@ msgid "Print"
 msgstr "Imprimir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:758
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
+#: 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
@@ -2352,8 +2555,8 @@ msgid "Success"
 msgstr "Éxito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -2361,7 +2564,7 @@ msgstr "Erro descoñecido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2378,10 +2581,10 @@ msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
 #: 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:726 calendar/gui/calendar-model.c:1247
 #: 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:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -2406,134 +2609,85 @@ msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: 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 coma"
+#. 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 do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Callback Phone"
 msgstr "Teléfono de Resposta"
 
-#: 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 do 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 do 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 "Alcume"
-
-#: 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-ocupado"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-msgid "Done."
-msgstr "Feito."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-msgid "Removing cards..."
-msgstr "Eliminando as tarxetas..."
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
@@ -2728,8 +2882,8 @@ msgstr "_Fonte..."
 msgid "Print cards"
 msgstr "Imprimir tarxetas"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 msgid "Print card"
 msgstr "Imprimir tarxeta"
 
@@ -2738,18 +2892,44 @@ msgstr "Imprimir tarxeta"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Alta"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Baixa"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Indefinida"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
@@ -2774,21 +2954,22 @@ 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 o control Axenda de exemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fábrica para centraliza-los diálogos editores de compoñentes da axenda"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to create a component editor factory"
+msgstr "Fábrica para centraliza-los diálogos editores de compoñentes da axenda"
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Servicio de notificación de alarma"
@@ -2797,45 +2978,45 @@ msgstr "Servicio de notificación de alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Fábica para o servicio de notificación de alarmas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Notificación da súa cita que comeza o %s e remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Notificación da súa cita que comeza o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Notificación da súa cita que remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Notificación da súa cita"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Notificación da súa tarefa que comeza o %s e remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Notificación da súa tarefa que comeza o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Notificación da súa tarefa que remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Notificación da súa tarefa"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
 
@@ -2856,177 +3037,149 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:556
+#: calendar/gui/alarm-notify/alarm-queue.c:629
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:775
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1130
-msgid "Reminder of your appointment at "
-msgstr "Recordatorio da cita en "
-
-#: calendar/gui/alarm-notify/alarm-queue.c:1066
-msgid "Snooze"
-msgstr "Adiar"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
-#: calendar/gui/alarm-notify/alarm-queue.c:1134
-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."
-msgstr "Son as %s. O tempo Unix é agora %ld. Pensamos que lle gostaría sabelo."
+"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 ""
 
-#: 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
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: 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 notificacións de alarma"
 
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:439
 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 %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
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:435
-#, 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
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c: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:1446
 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. Comprobe a súa configuración de "
 "ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 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:363
 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/dialogs/task-details-page.glade.h:6
-#: 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/dialogs/task-details-page.glade.h:9
-#: 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/dialogs/task-details-page.glade.h:8
-#: 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/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "Libre"
 
-#: 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:568 calendar/gui/e-calendar-table.c:438
+#: 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:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 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:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:460 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:323
+#: calendar/gui/calendar-model.c:908 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:332
+#: calendar/gui/calendar-model.c:911 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:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3037,7 +3190,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3047,49 +3200,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1120
 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
-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/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:1430
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
-#: mail/mail-config.glade.h:49
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:50
 #: 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-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1677
 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:1683 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:1683 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Non"
 
@@ -3121,44 +3262,44 @@ msgstr "A descrición conté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 "Non concorda"
 
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:63 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:64
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que contén citas e eventos"
 
-#: 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:178 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
+#: 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:69
 msgid "Folder containing to-do items"
 msgstr "Cartafol que contén elementos para-facer"
 
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 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:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 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:588
 msgid "New _Task"
 msgstr "Nova T_arefa"
 
@@ -3166,23 +3307,23 @@ msgstr "Nova T_arefa"
 msgid "The URI that the calendar will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Opcións das Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Opcións das Alarmas de Mensaxes"
 
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Opcións das Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Opcións de Alarma do Programa"
 
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Opcións de Alarma Descoñecidas"
 
@@ -3191,25 +3332,27 @@ msgid "Alarm Repeat"
 msgstr "Repetición da Alarma"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr "AMÁÑAME: opcións de alarma de correo"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mensaxe a Amosar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 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 "Repetir a alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 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 "Con estes argumentos:"
@@ -3230,98 +3373,120 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr "1 día"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:373
 #: 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:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Amosar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:385
 #: 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
-#: 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:391
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Treboada descoñecida"
 
-#: calendar/gui/dialogs/alarm-page.c:409
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:412
-msgid "after start of appointment"
-msgstr "despois do comezo da cita"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:422
-msgid "before end of appointment"
-msgstr "antes da fin da cita"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:425
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "antes do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "despois da fin da cita"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "despois da fin da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "un remitente descoñecido"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "Servidor %s %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3336,42 +3501,43 @@ msgstr "Data/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 "Resumo:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 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:116
+#: 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"
 
@@ -3420,7 +3586,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"
 
@@ -3433,7 +3599,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"
 
@@ -3442,7 +3608,7 @@ msgid "O_verdue tasks:"
 msgstr "Tarefas _retrasadas:"
 
 #: 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"
 
@@ -3463,7 +3629,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"
 
@@ -3480,7 +3646,7 @@ msgid "Tas_ks due today:"
 msgstr "Tarefas 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"
 
@@ -3501,12 +3667,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"
 
@@ -3635,55 +3801,55 @@ msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr " (Pendente "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1529
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1535
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3692,53 +3858,53 @@ 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:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:91
 #, 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:94
 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:100
 #, 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:103
 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:109
 #, 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:112
 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:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "¿Está seguro de que quere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "¿Está seguro de que quere borrar %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Está seguro de que quere borrar %d entradas de diario?"
@@ -3755,20 +3921,26 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: 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 "Recorrencia"
 
-#: 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 Xuntanza"
+
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
 msgid "Meeting"
 msgstr "Xuntanza"
 
@@ -3827,170 +3999,94 @@ 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 "Individual"
-
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-msgid "Group"
-msgstr "Grupo"
-
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-msgid "Resource"
-msgstr "Recurso"
-
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Room"
-msgstr "Cuarto"
-
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-msgid "Chair"
-msgstr "Presidencia"
-
-#: 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
-msgid "Needs Action"
-msgstr "Precisa dunha Acción"
-
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-msgid "Declined"
-msgstr "Rexeitado"
-
-#: 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
-msgid "Delegated"
-msgstr "Delegado"
-
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-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 "¡Esa persoa xa asiste á xuntanza!"
 
-#: 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
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: 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
 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
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: 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
 msgid "Non-Participants"
 msgstr "Non-Participantes"
 
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:661
 msgid "Sent By:"
 msgstr "Enviada Por:"
 
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:829
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Prema aquí para engadir un asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Nome Común"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Delegada Por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Delegada En"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Idioma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Membro"
 
 #: 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:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15 filter/libfilter-i18n.h:31
+#: 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:11
-#: calendar/gui/e-calendar-table.etspec.h:18 mail/mail-config.glade.h:85
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
@@ -4012,32 +4108,32 @@ msgstr "_Convidar a Outros"
 msgid "_Other Organizer"
 msgstr "_Outro 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:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 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 recorrencias 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
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1261
 msgid "occurrences"
 msgstr "ocorrencias"
 
@@ -4132,7 +4228,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:895
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4144,14 +4240,14 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: 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
 msgid "Assignment"
 msgstr "Asignación"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -4167,105 +4263,105 @@ msgstr "_Confidencial"
 msgid "_Due Date:"
 msgstr "_Data Límite"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 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:1283
-#: shell/e-shortcuts-view.c:381
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
+#: 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:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 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:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 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"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "_Borrar esta Tarefa"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -4274,12 +4370,8 @@ msgstr "Prema 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:7 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:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Completo"
 
@@ -4310,8 +4402,8 @@ 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:16
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1482 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Resumo"
 
@@ -4330,61 +4422,78 @@ 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:1462
 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:345
+#: calendar/gui/print.c:769
 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:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 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:3434 calendar/gui/e-week-view.c:3288
 #: 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:3436 calendar/gui/e-week-view.c:3290
 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:3445 calendar/gui/e-week-view.c:3298
 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:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Información de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4392,197 +4501,233 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr "<b>Resumo:</b> %s<br><br>"
 
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/e-itip-control.c:702
 #, c-format
 msgid "<b>Description:</b> %s"
 msgstr "<b>Descrición:</b> %s"
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou información sobre unha reunión."
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desexa asistir a unha reunión existente."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a reunión."
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respostou a unha petición de xuntanza."
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: 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:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou información sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:666
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a tarefa."
 
-#: calendar/gui/e-itip-control.c:681
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respostou a unha asignación de tarefa."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:713
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou información de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a súa información libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respostou a unha petición de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: 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:916
+#, 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:935
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Esta mensaxe só contén destinatarios Bcc."
+
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:1088
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "¡Non se puido envia-lo elemento!\n"
+
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1134
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1142
+msgid "Attendee status ould not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1144
+#, fuzzy
+msgid "Attendee status updated\n"
+msgstr "Enderezo do asistente"
+
+#: calendar/gui/e-itip-control.c:1146
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "¡Non se puido elimina-lo elemento do seu ficheiro de axenda!\n"
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
+#: calendar/gui/e-itip-control.c:1406
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4620,6 +4765,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 "Individual"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:671
+msgid "Group"
+msgstr "Grupo"
+
+#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:672
+msgid "Resource"
+msgstr "Recurso"
+
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:673
+msgid "Room"
+msgstr "Cuarto"
+
+#: 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/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:686
+msgid "Chair"
+msgstr "Presidencia"
+
+#: 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
+msgid "Needs Action"
+msgstr "Precisa dunha Acción"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:716
+msgid "Accepted"
+msgstr "Aceptado"
+
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:717
+msgid "Declined"
+msgstr "Rexeitado"
+
+#: 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
+msgid "Delegated"
+msgstr "Delegado"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+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:1937
+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:1965 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:1577
+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'"
@@ -4630,16 +4938,16 @@ 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:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1319
 #, 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:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
@@ -4700,209 +5008,210 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:254
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:300
-msgid "Calendar attachment"
-msgstr "Calendario anexo"
+#: 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 notificacións de alarma"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1938 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: 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:2341
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
@@ -5048,7 +5357,17 @@ msgstr ""
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:1085
+#: calendar/pcs/query.c:862
+#, fuzzy
+msgid "completed-before? expects 1 argument"
+msgstr "is-completed? espera 0 argumentos"
+
+#: calendar/pcs/query.c:867
+#, fuzzy
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr "time-day-begin espera que o argumento 1 sexa un time_t"
+
+#: calendar/pcs/query.c:1155
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "A avaliación da expresión de búsqueda non produce un valor booleano"
 
@@ -5098,66 +5417,83 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Volvendo a sincronizar co servidor"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operación"
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 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:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:786
 #, 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:791 camel/camel-filter-driver.c:809
 #, 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:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Erro ao executar a expresión de busca: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copiando as mensaxes"
+
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5166,7 +5502,7 @@ msgstr ""
 "Non se pode analizar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5175,16 +5511,16 @@ msgstr ""
 "Erro ao executar a expresión de busca: %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:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inválido no contido do corpo, esperábase unha cadea"
 
@@ -5221,12 +5557,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 "Non se puido obter un 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 "Non se puido obter un bloqueo usando flock(2): %s"
@@ -5285,56 +5621,84 @@ msgstr "Erro ao escribir o ficheiro temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar o ficheiro temporal de correo: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 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."
+#: camel/camel-pgp-context.c:525
+#, 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:1079 camel/camel-pgp-context.c:1266
-msgid "No password provided."
-msgstr "Non se indicou un contrasinal."
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#, 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:1086
-#: camel/camel-pgp-context.c:1273
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#, 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."
+#: camel/camel-pgp-context.c:699
+#, 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."
+#: camel/camel-pgp-context.c:891
+#, 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:903
-#, c-format
-msgid "Couldn't create temp file: %s"
+#: camel/camel-pgp-context.c:897
+#, 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:908
+#, 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:1069
-msgid "No plaintext to encrypt."
-msgstr "Non hai texto plano para cifrar."
+#: camel/camel-pgp-context.c:1076
+#, 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:1086
+#, 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:1093
+#, 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:1102
+#, 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:1264
+#, 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:1095
-msgid "No recipients specified"
-msgstr "Non se especificaron destinatarios."
+#: camel/camel-pgp-context.c:1272
+msgid "Cannot decrypt this message: no password provided"
+msgstr ""
 
-#: camel/camel-pgp-context.c:1258
-msgid "No ciphertext to decrypt."
-msgstr "Non hai texto cifrado para descifrar."
+#: camel/camel-pgp-context.c:1279
+#, 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
@@ -5352,38 +5716,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 "Servidor %s %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:353 camel/camel-remote-store.c:415
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: camel/camel-remote-store.c:491
-msgid "Server unexpectedly disconnected"
+#: camel/camel-remote-store.c:486
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
 #: camel/camel-sasl-anonymous.c:33
@@ -5493,7 +5858,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -5511,7 +5876,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:66 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -5540,55 +5905,55 @@ msgstr "Autorización POP antes de SMTP usando unha fonte non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilación da expresión regular: %s: %s"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:157
 #, 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:165
 #, 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:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:549
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:576
+#: camel/camel-service.c:629
 #, 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:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:603
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca 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 coma unha petición de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:297 camel/camel-session.c:366
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, 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:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5634,7 +5999,12 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "Failed to verify certificates."
 msgstr "Non se puido verifica-los certificados."
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: 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:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5644,7 +6014,7 @@ msgstr ""
 "Asunto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5683,16 +6053,40 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:554
 #, 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:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
 
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Non foi posible renomear o cartafol %s a %s: %s"
+
 #: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
@@ -5721,40 +6115,40 @@ 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 carga-lo resumo de %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 "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:435
+#: camel/providers/imap/camel-imap-folder.c:434
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1899
 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 "Recollendo información de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1640
+#: camel/providers/imap/camel-imap-folder.c:1639
 msgid "Scanning for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -5763,7 +6157,15 @@ 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-provider.c:43 mail/mail-config.glade.h:14
+#: 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 "Non se puido descodifica-la mensaxe."
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -5771,7 +6173,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:750
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -5804,28 +6206,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:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticación %s solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/imap/camel-imap-store.c:527
 #: 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:551
 #, 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:566
 #: 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:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5836,12 +6238,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:891
 #, 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:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -5862,81 +6264,86 @@ msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para recibir correo local dende spools estándar con formato mbox."
 
 #: camel/providers/local/camel-local-provider.c:60
+#, fuzzy
+msgid "Apply filters to new messages in INBOX"
+msgstr "Aplicar filtros ás 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
+#: camel/providers/local/camel-local-provider.c:67
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Para armacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr "Spools mbox estándar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:71
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Para ler e armacenar correo local en ficheiros spool estándar de tipo mbox."
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:111
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raíz de almacenamento %s non é unha ruta absoluta"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O raíz de armacenamento %s non é un directorio normal."
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non teñen un inbox"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 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:247
 #, 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:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:299
 #, 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 resumo: 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"
@@ -5945,19 +6352,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 "Contido da mensaxe non válido"
 
-#: 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 ""
@@ -5967,14 +6374,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 ""
@@ -5984,23 +6391,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
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%s': %s"
@@ -6012,13 +6419,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non se pode abri-la ruta do directorio maildir: %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
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
@@ -6031,9 +6438,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"
@@ -6043,12 +6450,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?"
 
@@ -6094,16 +6501,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
-msgid "Summarising folder"
-msgstr "Resumindo cartafol"
+#: 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 "Storing folder"
+msgstr "Sincronizando cartafol"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+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
@@ -6113,22 +6524,18 @@ msgstr ""
 "Erro grave do analizador de correo preto da posición %ld no cartafol %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#, 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
-msgid "Synchronising folder"
-msgstr "Sincronizando cartafol"
+#, fuzzy, c-format
+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
-#, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Non foi posible abrir o cartafol para o resumir: %s: %s"
+#: camel/providers/local/camel-spool-summary.c:649
+#, fuzzy, c-format
+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
@@ -6142,8 +6549,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 resumo e o cartafol non concordan, mesmo logo de sincronizar"
 
@@ -6154,14 +6561,14 @@ msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escribir á 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"
@@ -6178,7 +6585,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"
@@ -6198,60 +6605,66 @@ msgstr "`%s' non é un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir a ruta do directorio MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:465
+#: camel/providers/local/camel-spool-folder.c:470
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro de spool: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:132
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non existe."
 
-#: camel/providers/local/camel-spool-store.c:184
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro spool de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:220
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:228
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Os cartafoles spool non se poden eliminar"
 
+#. 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
+msgid "Summarising folder"
+msgstr "Resumindo cartafol"
+
+#: camel/providers/local/camel-spool-summary.c:384
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Non foi posible abir o cartafol: %s: resumindo desde a posición %ld: %s"
+
 #: 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
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Non foi posible sincroniza-lo cartafol temporal %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:817
+#: camel/providers/local/camel-spool-summary.c:822
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Non se puido sincroniza-lo cartafol spool %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"
@@ -6260,6 +6673,11 @@ msgstr ""
 "Non foi posible sincronizar o cartafol spool %s: %s\n"
 "O cartafol pode estar corrupto, copia gardada en `%s'"
 
+#: 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"
@@ -6337,31 +6755,31 @@ msgstr "Recibindo o resumo de POP"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Non foi posible abrir o cartafol: o listado de mensaxes era incompleto."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, 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:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Non existe a mensaxe con UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
@@ -6374,20 +6792,20 @@ msgstr "Armacenamento 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:49 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51
+#: camel/providers/pop3/camel-pop3-provider.c:53
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Para conectarse a servidores POP e descargar correo deles."
 
-#: camel/providers/pop3/camel-pop3-provider.c:68
+#: 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."
@@ -6395,7 +6813,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:78
+#: 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 "
@@ -6405,7 +6823,7 @@ msgstr ""
 "través do protocolo APOP. Pode que isto non funcione para tódolos usuarios, "
 "mesmo nalgúns servidores que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-provider.c:90
+#: 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 ""
@@ -6467,8 +6885,13 @@ 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 inesperada do servidor IMAP: %s"
+
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6523,7 +6946,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6682,7 +7105,7 @@ msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
 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"
 
@@ -6756,33 +7179,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: remate da 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: remate da 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"
@@ -6845,52 +7268,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: 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 "Para:"
 
-#: 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."
@@ -6903,16 +7326,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:670
-#, 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
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6921,29 +7335,29 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%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
 msgid "Warning!"
 msgstr "¡Aviso!"
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:871
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, ¿sobrescribir?"
 
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:893
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:912
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar 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?"
@@ -6951,16 +7365,16 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "¿Gostaríalle usar o cartafol de borradores por defecto?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1036
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1044
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1050
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6969,7 +7383,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1056
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6978,7 +7392,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6987,15 +7401,16 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %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 non gravados dunha sesión anterior.\n"
 "¿Gostaríalle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1313
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7005,28 +7420,28 @@ 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 "Mensaxe Remitida"
 
-#: 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
 msgid "Insert File"
 msgstr "Inserir Ficheiro"
 
-#: 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
 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
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7034,10 +7449,14 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:364
 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
 msgid "The Evolution groupware suite"
 msgstr "A suite de traballo en grupo Evolution"
@@ -7082,82 +7501,99 @@ msgstr "O asunto contén"
 msgid "Subject does not contain"
 msgstr "O asunto non contén"
 
-#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
-#: e-util/e-time-utils.c:243
-#: 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
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. 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 %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"
+
+#. 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 %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"
+
+#. 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 %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:277
-#: e-util/e-time-utils.c:368
+#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
-#: e-util/e-time-utils.c:360
+#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:365 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:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#. strptime format for hour and AM/PM
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
-msgid "%I %p"
-msgstr "%I %p"
-
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
-#: e-util/e-time-utils.c:357 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:1382 widgets/misc/e-dateedit.c:1609
 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:247
-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:251
-msgid "%Y/%m/%d"
-msgstr "%Y/%m/%d"
-
-#. 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:255
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:314
-#: 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:319
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:328
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:317
+msgid "%I %p"
+msgstr "%I %p"
 
 #: filter/filter-datespec.c:80
 msgid "year"
@@ -7248,6 +7684,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 Fuso Horario"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -7278,11 +7720,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"
 
@@ -7294,8 +7736,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:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
@@ -7320,39 +7762,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"
 
@@ -7396,193 +7838,192 @@ 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
 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 soa como"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "non comeza 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 "Recibiuse a mensaxe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Enviouse a mensaxe"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover a un 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 "Busca por Expresión Regular"
 
-#: 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:1114
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 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
 msgid "Size (kB)"
 msgstr "Tamaño (kB)"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "soa 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 o Procesamento"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: 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 soa como"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "non comeza 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 "soa como"
-
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "comeza por"
-
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi posterior a"
@@ -7599,7 +8040,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"
 
@@ -7607,7 +8048,7 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuación"
 
-#: filter/vfolder-rule.c:198
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
@@ -7615,40 +8056,34 @@ msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando o seu correo de Elm antigo"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:106
-#: importers/pine-importer.c:101
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:102
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:108
-#: importers/pine-importer.c:103
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:104
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:639
-#: importers/pine-importer.c:438
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
+#: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s coma %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:732
-#: importers/pine-importer.c:571
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
+#: importers/pine-importer.c:506
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: importers/elm-importer.c:526 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:903 importers/pine-importer.c:732
-#: shell/e-shell-importer.c:684 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Importar"
-
-#: importers/elm-importer.c:531 importers/netscape-importer.c:908
-#: importers/pine-importer.c:737 mail/component-factory.c:96
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
+#: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Correo"
 
-#: importers/elm-importer.c:554
+#: importers/elm-importer.c:548
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7656,15 +8091,20 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Elm.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: importers/elm-importer.c:583
-msgid "Elm mail"
-msgstr "Correo de Elm"
+#: importers/elm-importer.c:577
+msgid "Elm"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:230
+#, fuzzy
+msgid "GnomeCard:"
+msgstr "Tarxeta: "
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:742
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
 msgid "Addressbook"
 msgstr "Libro de Enderezos"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7672,23 +8112,23 @@ msgstr ""
 "Evolution atopou ficheiros GnomeCard.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: importers/netscape-importer.c:105
+#: importers/netscape-importer.c:107
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#: importers/netscape-importer.c:835 importers/pine-importer.c:667
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: importers/netscape-importer.c:844
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr "Comezando a importación"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "Opcións"
 
-#: importers/netscape-importer.c:938
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7696,11 +8136,12 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: importers/pine-importer.c:100
-msgid "Evolution is importer your old Pine data"
+#: importers/pine-importer.c:101
+#, fuzzy
+msgid "Evolution is importing your old Pine data"
 msgstr "Evolution está importando os seus datos de Pine antigos"
 
-#: importers/pine-importer.c:768
+#: importers/pine-importer.c:695
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7708,9 +8149,10 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: importers/pine-importer.c:796
-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."
@@ -7737,14 +8179,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 Resumo de Correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "Interface de configuración do correo"
 
@@ -7768,27 +8206,33 @@ msgstr "Cartafol de Lixo Virtual"
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: mail/component-factory.c:345
+#: mail/component-factory.c:356
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:345
+#: mail/component-factory.c:356
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "Nova _Mensaxe"
 
-#: mail/component-factory.c:799
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:938
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
@@ -7801,129 +8245,159 @@ msgstr "Propiedades de \"%s\""
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:229 mail/mail-display.c:275
+#: mail/folder-browser.c:262 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:905
+#: mail/folder-browser.c:734
+#, c-format
+msgid "%d new"
+msgstr "%d nova(s)"
+
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:738
+#, c-format
+msgid "%d hidden"
+msgstr "%d oculta(s)"
+
+#: mail/folder-browser.c:743
+#, c-format
+msgid "%d selected"
+msgstr "%d seleccionada(s)"
+
+#: mail/folder-browser.c:748
+#, c-format
+msgid "%d unsent"
+msgstr "%d sen enviar"
+
+#: mail/folder-browser.c:750
+#, c-format
+msgid "%d total"
+msgstr "%d total"
+
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr "Crear un CartafolV da Busca"
 
-#: mail/folder-browser.c:1250
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1265
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1268
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1271
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1307
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1314
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/folder-browser.c:1316
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1330
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:1492
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtrar pola Lista de Correo"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:1495
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
@@ -7997,11 +8471,18 @@ msgstr "Editor de Novas de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:1010
+#: mail/mail-account-gui.c:947
+#, fuzzy
+msgid "Could not save signature file."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
+
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "Gravar sinatura"
 
-#: mail/mail-account-gui.c:1016
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8011,40 +8492,40 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: mail/mail-account-gui.c:1597
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome"
 
-#: 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 "Desactivar"
 
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:191
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:279
+#: 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:283
+#: mail/mail-accounts.c:282
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:286
+#: mail/mail-accounts.c:285
 msgid "Really delete account?"
 msgstr "¿Borrar esta conta de verdade?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: 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:758 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Configuración de Correo"
 
@@ -8104,7 +8585,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?"
@@ -8112,7 +8605,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:262
+#: 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."
@@ -8120,53 +8613,55 @@ msgstr ""
 "Xa que a lista de contactos á que envía está configurada para agocha-los "
 "enderezos da lista, esta mensaxe só ha conter destinatarios Bcc."
 
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:321
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:325
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"É posible que o servidor de correo revele os destinatarios engadindo unha cabeceira Apparently-To.\n"
+"É posible que o servidor de correo revele os destinatarios engadindo unha "
+"cabeceira Apparently-To.\n"
 "¿Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:419
+#, fuzzy
+msgid "This message contains invalid recipients:"
+msgstr "Esta mensaxe só contén destinatarios Bcc."
+
+#: mail/mail-callbacks.c:454
 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:424
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr "Ten que configurar unha conta antes de poder enviar este correo."
 
-#: mail/mail-callbacks.c:666
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
-#: mail/mail-callbacks.c:671
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
 
-#: mail/mail-callbacks.c:934
-msgid "Forwarded message:\n"
-msgstr "Mensaxe remitida:\n"
-
-#: mail/mail-callbacks.c:1034
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1036
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1405
+#: mail/mail-callbacks.c:1547
 #, 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:1427
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8174,7 +8669,7 @@ msgstr ""
 "Só pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:1461
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8182,28 +8677,28 @@ msgstr ""
 "Só pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:1473
+#: mail/mail-callbacks.c:1615
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:1579
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1581
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1726 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: mail/mail-callbacks.c:1731
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8215,11 +8710,11 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:1738
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: mail/mail-callbacks.c:1843
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8228,19 +8723,19 @@ msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1853
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:1899
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
-#: mail/mail-callbacks.c:2029
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8252,7 +8747,8 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"Introduza o seu nome e enderezo de correo embaixo. Os campos \"opcionais\" de embaixo non precisan que se enchan,\n"
+"Introduza o seu nome e enderezo de correo embaixo. Os campos \"opcionais\" "
+"de embaixo non precisan que se enchan,\n"
 "a menos que queira incluír esta información no correo que envíe."
 
 #: mail/mail-config-druid.c:137
@@ -8261,7 +8757,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Por favor, introduza informacion sobre o seu servidor de correo entrante. Se non está seguro, pregunte\n"
+"Por favor, introduza informacion sobre o seu servidor de correo entrante. Se "
+"non está seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
 #: mail/mail-config-druid.c:139
@@ -8274,7 +8771,8 @@ msgid ""
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Por favor, introduza información sobre o xeito no que envía correo. Se non está seguro, pregunte ao\n"
+"Por favor, introduza información sobre o xeito no que envía correo. Se non "
+"está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
 #: mail/mail-config-druid.c:143
@@ -8287,9 +8785,12 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Case rematou co proceso de configuración do correo. A identidade, servidor de correo entrente e método\n"
-"de transporte de correo saínte que proporcionou hanse agrupar para crear unha conta\n"
-"de correo de Evolution. Introduza un nome para esta conta no espacio de embaixo.\n"
+"Case rematou co proceso de configuración do correo. A identidade, servidor "
+"de correo entrente e método\n"
+"de transporte de correo saínte que proporcionou hanse agrupar para crear "
+"unha conta\n"
+"de correo de Evolution. Introduza un nome para esta conta no espacio de "
+"embaixo.\n"
 "Este nome só se emprega para amosalo."
 
 #. set window title
@@ -8297,81 +8798,107 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de 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:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Conta"
+
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
 #.
-#: mail/mail-config.c:1585
+#: mail/mail-config.c:1629
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Inbox"
 
-#: mail/mail-config.c:1819
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:1890 mail/mail-config.c:1893
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "Dete_ctar tipos soportados "
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non está soportado nesta versión de evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Información de Contas"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xestión de Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Compoñedor"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuración do Correo"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Limpando o cartafol"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8387,237 +8914,225 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "Codificación de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Amosar"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "Cada conta ten que ter un nome diferente."
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "Ficheiro de sinatura HTML:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "Localización da caixa do correo"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "Debe amosarse a _previsualización da mensaxe por defecto"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "A lista de mensaxes debe amosarse en modo _fío por defecto"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Opcións de Recepción"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Información Requirida"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "Seleccionar un ficheiro de rexistro para o filtro..."
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "Seleccionar un binario PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "O servidor require _autenticación"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "Información da Fonte"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Cartafoles Especiais"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Usar conexión segura (_SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8627,78 +9142,74 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "_Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor está no libro de enderezos"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organización:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "Ruta do binario _PGP:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "_Lembrar o contrasinal PGP ata saír"
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
@@ -8731,39 +9242,39 @@ msgstr "[gardasitio]"
 msgid "seconds."
 msgstr "segundos."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Non foi posible crear un contexto de sinatura PGP."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "Non foi posible crear un contexto de verificación PGP."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "Non foi posible crear un contexto de cifrado PGP."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "Non foi posible crear un contexto de descifrado PGP."
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Non foi posible crear un contexto de sinatura S/MIME."
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Non foi posible crear un contexto de só certificación S/MIME."
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "Non foi posible crear un contexto de cifrado S/MIME."
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr "Non foi posible crear un contexto de sobre S/MIME."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificación S/MIME."
 
@@ -8771,195 +9282,177 @@ msgstr "Non foi posible crear un contexto de descodificación S/MIME."
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:332
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:329
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:336
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:397
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (mediante %s)"
 
-#: mail/mail-display.c:401
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:422
+#: mail/mail-display.c:417
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1049
+#: mail/mail-display.c:1053
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1405
+#: mail/mail-display.c:1515
 msgid "Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/mail-display.c:1407
+#: mail/mail-display.c:1517
 msgid "Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/mail-display.c:1409
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligazón coma (AMÁÑAME)"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-folder-cache.c:151
-#, c-format
-msgid "%d new"
-msgstr "%d nova(s)"
-
-#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
-#: mail/mail-folder-cache.c:171
-msgid ", "
-msgstr ", "
-
-#: mail/mail-folder-cache.c:158
-#, c-format
-msgid "%d hidden"
-msgstr "%d oculta(s)"
-
-#: mail/mail-folder-cache.c:165
-#, c-format
-msgid "%d selected"
-msgstr "%d seleccionada(s)"
-
-#: mail/mail-folder-cache.c:174
-#, c-format
-msgid "%d unsent"
-msgstr "%d sen enviar"
-
-#: mail/mail-folder-cache.c:176
-#, c-format
-msgid "%d total"
-msgstr "%d total"
-
-#: 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:862
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:881
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:887
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non está configurado."
 
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Non se amosa a mensaxe cifrada"
 
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Prema na icona para descifrar."
 
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1440
 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:1451
 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:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2142
 #, 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:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2184
 #, 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:2189
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/mail-local.c:330
-#, c-format
-msgid "No such folder /%s"
-msgstr "Non existe o cartafol /%s"
+#: mail/mail-local.c:563
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "Refrescando o cartafol"
 
-#: mail/mail-local.c:460
-#, c-format
-msgid "Registering '%s'"
-msgstr "Rexistrando '%s'"
+#: mail/mail-local.c:636
+#, fuzzy, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s: %s"
+msgstr ""
+"Non foi posible garda-la metainformación do cartafol, seguramente\n"
+"non poderá abrir este cartafol outra vez: %s"
+
+#: mail/mail-local.c:689
+#, 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:747
+#: mail/mail-local.c:735
+#, fuzzy, c-format
+msgid "Cannot delete folder metadata %s: %s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:1090
 #, 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 garda-la metainformación do cartafol, seguramente\n"
-"non poderá abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8967,16 +9460,16 @@ msgstr ""
 "Se non pode abrir máis esta caixa de correo, poida\n"
 "que teña que reparala a man."
 
-#: mail/mail-local.c:1001
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non se pode cambia-lo formato dun cartafol non local."
 
-#: mail/mail-local.c:1012
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -8985,7 +9478,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -8995,126 +9488,139 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:439
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: mail/mail-mt.c:570
+#, fuzzy
+msgid "Enter Password"
+msgstr "Contrasinal"
+
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:229
 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:710
+#: mail/mail-ops.c:668
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:729
+#: 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:731 mail/mail-send-recv.c:500
+#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:782
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:920
+#: mail/mail-ops.c:878
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:881
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1035
+#: 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:1075 mail/mail-ops.c:1076 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Lixo"
 
-#: mail/mail-ops.c:1212
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1254
+#: mail/mail-ops.c:1215
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1396
-#, c-format
-msgid "Creating folder %s"
-msgstr "Creando o cartafol %s"
-
-#: mail/mail-ops.c:1466
+#: mail/mail-ops.c:1353
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1562
-#, c-format
-msgid "Synchronizing '%s'"
-msgstr "Sincronizando '%s'"
+#: mail/mail-ops.c:1445
+#, fuzzy, c-format
+msgid "Storing folder '%s'"
+msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1613
+#: mail/mail-ops.c:1496
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1532
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1698
+#: mail/mail-ops.c:1581
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1765
+#: mail/mail-ops.c:1648
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1734
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1931
+#: mail/mail-ops.c:1846
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9123,7 +9629,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1957
+#: mail/mail-ops.c:1874
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9132,11 +9638,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2031
+#: mail/mail-ops.c:1948
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9145,16 +9651,21 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2078
+#: 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:2147
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Desconectando de %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Buscar"
@@ -9191,53 +9702,93 @@ msgstr "Buscar:"
 msgid "Matches:"
 msgstr "Aparicións:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:139
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:258
-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:283
+#, fuzzy
+msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:284
+#, fuzzy
+msgid "Cancel All"
+msgstr "Cancelar"
+
+#: mail/mail-send-recv.c:333
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
+#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-send-recv.c:496
+#: 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 "O usuario cancelou a operación."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
-#: mail/mail-vfolder.c:280
+#: mail/mail-vfolder.c:84
+#, fuzzy, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Creando o cartafol %s"
+
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Examinando os cartafoles en \"%s\""
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:500
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
@@ -9306,7 +9857,7 @@ msgstr "O %A ás %k:%M"
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2316
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -9322,36 +9873,36 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Examinando os cartafoles baixo %s en \"%s\""
 
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:221
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles de nivel raíz 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
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1582
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
@@ -9391,35 +9942,33 @@ msgstr "_Desubscribir"
 msgid "Evolution component for the executive summary."
 msgstr "Compoñente de Evolution para o resumo 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
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartafol que contén o Resumo de Evolution"
 
-#: my-evolution/component-factory.c:141
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Non se pode inicializar o compoñente de Resumo Executivo de Evolution."
 
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "Non hai citas"
 
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr "%l:%M%p"
+#: my-evolution/e-summary-calendar.c:301
+#, fuzzy
+msgid "%k%M %d %B"
+msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr "%a %k:%M"
+#: my-evolution/e-summary-calendar.c:303
+#, fuzzy
+msgid "%l:%M %d %B"
+msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:113
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
@@ -9427,80 +9976,83 @@ msgstr "Resumo de correo"
 #. see in My Evolution by default. You can find the list of all
 #. 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-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LEVX:LECO:LEST"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Palabra do Día de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:448
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "Citas do Día"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduza o URL da fonte de novas que desexe engadir"
 
-#: my-evolution/e-summary-preferences.c:887
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1419
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "Preferencias do Resumo"
 
-#: my-evolution/e-summary-rdf.c:281
-msgid "There was an error downloading news feed"
-msgstr "Houbo un erro ao descarga-la fonte de novas"
-
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-msgid "<b>Error downloading RDF</b>"
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
+#, fuzzy
+msgid "Error downloading RDF"
 msgstr "<b>Erro descargando o RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-tasks.c:277
+#, fuzzy
+msgid "(No Description)"
+msgstr "Descrición:"
+
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:324
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Non se puido contactar co servidor de tempo</b></dd>"
 
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "Tempo"
 
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "Rexións"
 
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B de %Y"
 
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "A impresión do Resumo fallou"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "O compoñente Resumo Executivo non puido inicializar Bonobo.\n"
 
@@ -10727,69 +11279,71 @@ msgid "One w_eek"
 msgstr "Unha sema_na"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
+#, fuzzy
+msgid "R_efresh time (seconds):"
 msgstr "_Tempo de refresco (segundos):"
 
 #: my-evolution/my-evolution.glade.h:13
+msgid "Refresh _time (seconds):"
+msgstr "_Tempo de refresco (segundos):"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "S_how full path for folders"
+msgstr "Amo_sa-las rutas completas dos cartafoles"
+
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show _all tasks"
 msgstr "_Amosar tódalas tarefas"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _today's tasks"
 msgstr "Amosa-las _tarefas de hoxe"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:17
 msgid "Tasks "
 msgstr "Tarefas "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
 msgid "Units: "
 msgstr "Unidades: "
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
 msgid "Weather settings"
 msgstr "Configuración do tempo"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:21
 msgid "_Display folders:"
 msgstr "_Amosar cartafoles:"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Display stations:"
 msgstr "_Amosar estacións:"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Displayed feeds:"
 msgstr "Fontes _amosadas:"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Five days"
 msgstr "_Cinco días"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:25
 msgid "_Mail"
 msgstr "_Correo"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:26
 msgid "_News Feeds"
 msgstr "Fontes de _Novas"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:27
 msgid "_One day"
 msgstr "_Un día"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr "Tempo de _refresco (segundos):"
-
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:28
 msgid "_Schedule"
 msgstr "_Programar"
 
-#: my-evolution/my-evolution.glade.h:28
-msgid "_Show full path for folders"
-msgstr "Amo_sa-las rutas completas dos cartafoles"
-
 #: my-evolution/my-evolution.glade.h:29
 msgid "_Weather"
 msgstr "_Tempo"
@@ -10806,15 +11360,15 @@ msgstr "m_étricas"
 msgid "The Evolution shell."
 msgstr "O shell de Evolution."
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Amosa-los Detalles"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Cancelar Operación"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -10822,7 +11376,7 @@ msgstr "Entrada"
 msgid "Outbox"
 msgstr "Saída"
 
-#: shell/e-local-storage.c:623
+#: shell/e-local-storage.c:624
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
@@ -10902,37 +11456,37 @@ msgstr ""
 "directorio de Evolution. Móvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Non se pode copiar un cartafol a si mesmo."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Indique un cartafol no que copia-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Copiar cartafol"
 
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Indique un cartafol no que move-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:333
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Mover cartafol"
 
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10941,33 +11495,35 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:374
-#, c-format
-msgid "Delete folder '%s'"
-msgstr "Elimina-lo cartafol '%s'"
+#: shell/e-shell-folder-commands.c:406
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Eliminar"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
-#, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+#: shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "¿Está seguro de que quere borrar o cartafol '%s'?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:459
-#, c-format
-msgid "Rename folder '%s'"
-msgstr "Renomea-lo cartafol '%s'"
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:463
-msgid "Rename"
-msgstr "Renomear"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomea-lo cartafol '%s'"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome do cartafol:"
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Renomea-lo cartafol '%s'"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11003,7 +11559,7 @@ msgstr "O nome de cartafol indicado non é válido: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11011,15 +11567,19 @@ msgstr ""
 "O tipo do cartafol seleccionado non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 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:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11033,9 +11593,13 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará "
 "averigualo."
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11046,7 +11610,7 @@ msgstr ""
 "O importador non está preparado.\n"
 "Agardando 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11055,7 +11619,16 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:396
+#, fuzzy, c-format
+msgid "File %s does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#: shell/e-shell-importer.c:408
+msgid "You may only import to local folders"
+msgstr ""
+
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11064,11 +11637,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11077,17 +11650,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11096,35 +11669,65 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:622
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importar un formato de ficheiro externo"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Agarde...\n"
+"Buscando configuracións existentes"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Iniciando os Importadores Intelixentes"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "De:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importar"
+
+#: shell/e-shell-offline-handler.c:562
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-startup-wizard.c:161
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Wizard interface\n"
@@ -11133,37 +11736,37 @@ msgstr ""
 "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:170
+#: shell/e-shell-startup-wizard.c:168
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Non se pode inicializar a interface do Mago do Correo de Evolution."
 
-#: shell/e-shell-startup-wizard.c:580
+#: shell/e-shell-startup-wizard.c:745
 msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
+"Please select the information\n"
+"that you would like to import"
 msgstr ""
-"Agarde...\n"
-"Buscando configuracións existentes"
 
-#: shell/e-shell-startup-wizard.c:583
-msgid "Starting Intelligent Importers"
-msgstr "Iniciando os Importadores Intelixentes"
-
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:235
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
+#, 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 ""
@@ -11171,28 +11774,37 @@ 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:442
 msgid "Go to folder..."
 msgstr "Ir ó cartafol..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:569
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Escolla o cartafol ao que quere que apunte o atallo:"
 
-#: shell/e-shell-view-menu.c:684
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Erro ao executar o filtro: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Traballar Conectado"
 
-#: 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:718 shell/e-shell-view-menu.c:731
+#: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -11200,43 +11812,48 @@ msgstr "Traballar Desconectado"
 msgid "(No folder displayed)"
 msgstr "(Ningún cartafol visualizado)"
 
-#: shell/e-shell-view.c:1495
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1497
+#: shell/e-shell-view.c:1514
 msgid "(None)"
 msgstr "(Nada)"
 
-#: shell/e-shell-view.c:1502
-#, c-format
-msgid "%s - Evolution %s"
+#: shell/e-shell-view.c:1519
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1504
-#, c-format
-msgid "%s - Evolution %s [%s]"
+#: shell/e-shell-view.c:1521
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1544
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1561
+#, fuzzy
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion está conectado. Prema neste botón para desconectar."
 
-#: shell/e-shell-view.c:1551
-msgid "Evolution is in the process of going offline."
+#: shell/e-shell-view.c:1568
+#, fuzzy
+msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution está desconectándose"
 
-#: shell/e-shell-view.c:1557
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1574
+#, fuzzy
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution está desconectado. Prema neste botón para conectar."
 
-#: shell/e-shell.c:509
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11245,35 +11862,35 @@ msgstr ""
 "Ooops!  As vistas de `%s' morreron 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:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "Argumentos non válidos"
 
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:75
 msgid "Create new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:174
+#: shell/e-shortcuts-view.c:176
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11282,164 +11899,173 @@ msgstr ""
 "¿Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:179
+#: shell/e-shortcuts-view.c:181
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:207
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renomear Grupo de Atallos"
 
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear o grupo de atallos seleccionado a:"
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:225
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:222
+#: 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:224
+#: shell/e-shortcuts-view.c:228
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:225
+#: 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:236
+#: shell/e-shortcuts-view.c:240
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:241
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:243
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:244
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:246
 msgid "Re_name this Group..."
 msgstr "Re_nomear este Grupo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:247
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:252
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:253
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:368
+#: shell/e-shortcuts-view.c:372
 msgid "Rename shortcut"
 msgstr "Renomear atallo"
 
-#: shell/e-shortcuts-view.c:369
+#: shell/e-shortcuts-view.c:373
 msgid "Rename selected shortcut to:"
 msgstr "Renomea-lo atallo seleccionado a:"
 
-#: shell/e-shortcuts-view.c:381
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir o cartafol ligado a este atallo"
 
-#: shell/e-shortcuts-view.c:383 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova _Fiestra"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:387
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abri-lo cartafol ligado a este atallo nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:390
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:390
 msgid "Rename this shortcut"
 msgstr "Renomear este atallo"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:392
 msgid "Re_move"
 msgstr "Eli_minar"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:392
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:642
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1044
 msgid "Shortcuts"
 msgstr "Atallos"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non é válido"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Función non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Operación non soportada"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non está soportado neste almacenamento"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
 
-#: shell/e-task-widget.c:170
+#: shell/e-task-widget.c:192
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:197
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
@@ -11460,6 +12086,10 @@ msgstr "Servidor"
 msgid "The following connections are currently active:"
 msgstr "As seguintes conexións están activas nestes intres:"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome do cartafol:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Tipo do cartafol:"
@@ -11511,14 +12141,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Asistente Importador de Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "Importar Ficheiro (Paso 2 de 2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "Importar Ficheiro (Paso 2 de 2)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -11544,13 +12186,18 @@ msgstr "Non preguntar de novo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: shell/main.c:95
-#, no-c-format
+#: shell/main.c:82
+#, fuzzy
+msgid "Evolution is now exiting ..."
+msgstr "_Fiestra de Evolution"
+
+#: 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"
@@ -11573,32 +12220,34 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\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
-msgid "Cannot access the Evolution shell."
+#: shell/main.c:231
+#, fuzzy
+msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:184
-#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
+#: shell/main.c:242
+#, fuzzy, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: 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."
 
@@ -11708,35 +12357,28 @@ msgstr "_Contacto"
 msgid "_Contact List"
 msgstr "Lista de _Contactos"
 
-#: 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
 msgid "_Forward Contact..."
 msgstr "_Remitir Contacto..."
 
-#: 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
 msgid "_Save as VCard"
 msgstr "_Gardar coma VCard"
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:39
 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-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/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Ferramentas"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Configura-la axenda"
@@ -11845,11 +12487,11 @@ msgstr "_Cita..."
 msgid "_Calendar Settings..."
 msgstr "_Preferencias da Axenda..."
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:43
 msgid "_Task..."
 msgstr "_Tarefa..."
 
@@ -11870,7 +12512,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"
 
@@ -11886,14 +12528,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"
 
@@ -11908,9 +12549,9 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: 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-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -11918,7 +12559,7 @@ msgstr "_Ficheiro"
 msgid "Print En_velope..."
 msgstr "Imprimir So_bre..."
 
-#: 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..."
@@ -11930,8 +12571,8 @@ msgstr "Gardar o contacto e pechar a caixa de diálogo"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -12037,7 +12678,8 @@ msgstr "Abrir unha fiestra para compoñer unha mensaxe de correo"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
+msgstr ""
+"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
@@ -12174,23 +12816,23 @@ msgstr "Agochar temporalmente 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
 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
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por Fíos"
 
@@ -12523,6 +13165,11 @@ msgstr "Visualización _Normal"
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Ferramentas"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
@@ -12534,8 +13181,8 @@ msgstr "Pechar esta fiestra"
 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-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vista"
 
@@ -12697,36 +13344,31 @@ msgid "_Cc Field"
 msgstr "Campo _Cc"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Depuración"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -12806,12 +13448,13 @@ msgstr "Pegar a tarefa dende o portarretallos"
 msgid "Tasks Settings..."
 msgstr "Preferencias das Tarefas..."
 
-#: 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 de Evolution..."
 
 #: ui/evolution.xml.h:2
@@ -12851,101 +13494,110 @@ msgid "E_xit"
 msgstr "_Saír"
 
 #: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "_FAQ de Evolution"
-
-#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Fiestra de 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
-msgid "Import an external file format"
-msgstr "Importar un formato de ficheiro externo"
+#: ui/evolution.xml.h:15
+msgid "Import data from other programs"
+msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
 msgstr "Mover este cartafol a outro sitio"
 
-#: ui/evolution.xml.h:19
+#: 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
 msgid "Open this folder in an other window"
 msgstr "Abrir este cartafol noutra 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 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
 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
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra 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 mostra da barra de atallos"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: 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 "_FAQ de Evolution"
+
 #: ui/evolution.xml.h:32
-msgid "_About Evolution..."
+#, fuzzy
+msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
 #: ui/evolution.xml.h:34
 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
-msgid "_Import File..."
-msgstr "_Importar Ficheiro..."
+#: ui/evolution.xml.h:41
+#, fuzzy
+msgid "_Import..."
+msgstr "Importando..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 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:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Preferencias de Correo..."
+
 #: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Renomear..."
@@ -12958,7 +13610,7 @@ msgstr "_Atallo"
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
@@ -13036,81 +13688,6 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o botón dereito para alonxarse."
 
-#. 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 "Tódolos Asistentes"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista Actual"
@@ -13130,11 +13707,11 @@ msgstr "LMMXVSD"
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Hoxe"
 
@@ -13277,819 +13854,1042 @@ msgstr "O Servidor Persoal de Libro de Enderezos"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "O Servidor Persoal de Axenda; fábrica de axendas"
 
-#: wombat/wombat.c:173
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
 
-#: wombat/wombat.c:185
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): non foi posible inicializar GNOME"
 
-#: wombat/wombat.c:198
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
-msgid "Spool stores do not have an inbox"
-msgstr "Os armacenamentos de spools non teñen un inbox"
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
 
-msgid "Standard Unix mailbox file"
-msgstr "Ficheiro mailbox estándar de Unix"
+#~ msgid "Unable to get local storage.  This should never happen."
+#~ msgstr ""
+#~ "Non foi posible obter armacenamento local. Isto nunca debeu ter pasado."
 
-msgid "Unix mbox spool-format mail files"
-msgstr "Ficheiros de correo con formato de spool mbox de Unix"
+#~ msgid "123"
+#~ msgstr "123"
 
-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 sistemas de email "
-"propietarios."
+#~ msgid "a"
+#~ msgstr "a"
 
-msgid "???"
-msgstr "???"
+#~ msgid "b"
+#~ msgstr "b"
 
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
+#~ msgid "c"
+#~ msgstr "c"
 
-msgid "_Company:"
-msgstr "_Compañía:"
+#~ msgid "d"
+#~ msgstr "d"
 
-msgid "USA"
-msgstr "Estados Unidos"
+#~ msgid "e"
+#~ msgstr "e"
 
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
+#~ msgid "f"
+#~ msgstr "f"
 
-msgid "As _Table"
-msgstr "Como unha _Táboa"
+#~ msgid "g"
+#~ msgstr "g"
 
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Non foi posible abrir este libro de enderezos. Isto\n"
-"significa que introduciu un URI incorrecto, ou que se\n"
-"tentou acceder a un servidor LDAP e o programa non\n"
-"está compilado con soporte LDAP. Se introduciu un URI\n"
-"comprobe que sexa correcto e volva introducilo.\n"
-"Senón, probablemente tentou acceder a un servidor LDAP.\n"
-"Se desexa poder usar LDAP, necesitará baixar e\n"
-"instalar OpenLDAP e recompilar e instalar Evolution.\n"
+#~ msgid "h"
+#~ msgstr "h"
 
-msgid "Unknown addressbook type"
-msgstr "Tipo de libro de enderezos descoñecido"
+#~ msgid "i"
+#~ msgstr "i"
 
-msgid "None (anonymous mode)"
-msgstr "Ningún (modo anónimo)"
+#~ msgid "j"
+#~ msgstr "j"
 
-msgid "SASL"
-msgstr "SASL"
+#~ msgid "k"
+#~ msgstr "k"
 
-msgid "Unknown auth type"
-msgstr "Tipo de autenticación descoñecido"
+#~ msgid "l"
+#~ msgstr "l"
 
-msgid "Subtree"
-msgstr "Subárbore"
+#~ msgid "m"
+#~ msgstr "m"
 
-msgid "Unknown scope type"
-msgstr "Tipo de ámbito descoñecido"
+#~ msgid "n"
+#~ msgstr "n"
 
-msgid "Bind DN:"
-msgstr "Asignar DN:"
+#~ msgid "o"
+#~ msgstr "o"
 
-msgid "FIXME Bind DN Help text here"
-msgstr "AMÁÑAME Texto de axuda para Asignar DN aquí"
+#~ msgid "p"
+#~ msgstr "p"
 
-msgid "FIXME Host help text here."
-msgstr "AMÁÑAME Texto de axuda para Servidor aquí"
+#~ msgid "q"
+#~ msgstr "q"
 
-msgid "FIXME Port help text here."
-msgstr "AMÁÑAME Texto de axuda para Porto aquí"
+#~ msgid "r"
+#~ msgstr "r"
 
-msgid "Root DN:"
-msgstr "DN Raíz:"
+#~ msgid "s"
+#~ msgstr "s"
 
-msgid "FIXME Root DN help text here."
-msgstr "AMÁÑAME Texto de axuda para DN Raíz aquí"
+#~ msgid "t"
+#~ msgstr "t"
 
-msgid "Authentication:"
-msgstr "Autenticación:"
+#~ msgid "u"
+#~ msgstr "u"
 
-msgid "FIXME Path Help text here"
-msgstr "AMÁÑAME Texto de axuda para Ruta aquí"
+#~ msgid "v"
+#~ msgstr "v"
 
-msgid "Create path if it doesn't exist."
-msgstr "Crear ruta se non existe."
+#~ msgid "w"
+#~ msgstr "w"
 
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Escolla a clase de Libro de Enderezos que ten, e introduza a información "
-"relevante sobre el."
+#~ msgid "x"
+#~ msgstr "x"
 
-msgid "FIXME Name help text here"
-msgstr "AMÁÑAME Texto de axuda para Nome aquí"
+#~ msgid "y"
+#~ msgstr "y"
 
-msgid "FIXME Description help text here"
-msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
+#~ msgid "z"
+#~ msgstr "z"
 
-msgid "Edit"
-msgstr "Editar"
+#~ msgid "Done."
+#~ msgstr "Feito."
 
-msgid "Name"
-msgstr "Nome:"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Fábrica para o compoñente da axenda de Evolution."
 
-msgid "URI"
-msgstr "URI"
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Recordatorio da cita en "
 
-msgid "Find..."
-msgstr "Buscar..."
+#~ msgid "Snooze"
+#~ msgstr "Adiar"
 
-msgid "Select name from:"
-msgstr "Seleccionar nome dende:"
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
 
-msgid "Open calendar"
-msgstr "Abrir axenda"
+#~ msgid ""
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
+#~ msgstr ""
+#~ "Son as %s. O tempo Unix é agora %ld. Pensamos que lle gostaría sabelo."
 
-msgid "Save calendar"
-msgstr "Gardar axenda"
+#~ msgid "%d"
+#~ msgstr "%d"
 
-msgid "Transparent"
-msgstr "Transparente"
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
 
-msgid "Opaque"
-msgstr "Opaco"
+#~ msgid "FIXME: mail alarm options"
+#~ msgstr "AMÁÑAME: opcións de alarma de correo"
 
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"A clasificación ten que ser 'Pública', 'Privada', 'Confidencial' ou "
-"'Ningunha'"
+#~ msgid "before start of appointment"
+#~ msgstr "antes do comezo da cita"
 
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
+#~ msgid "after start of appointment"
+#~ msgstr "despois do comezo da cita"
 
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro cargando a axenda:<br>Método non soportado"
+#~ msgid "before end of appointment"
+#~ msgstr "antes da fin da cita"
 
-msgid "Alarms timeout after"
-msgstr "As alarmas saltan despois de"
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "¡Non foi posible actualizar o ficheiro da axenda!\n"
 
-msgid "Beep when alarm windows appear."
-msgstr "Chifrar cando aparece a fiestra de alarma."
+#~ msgid "Calendar attachment"
+#~ msgstr "Calendario anexo"
 
-msgid "Calendar Preferences"
-msgstr "Preferencias da Axenda"
+#~ msgid "No plaintext to sign."
+#~ msgstr "Non hai texto plano para asinar."
 
-msgid "Date navigator options"
-msgstr "Opcións do navegador de datas"
+#~ msgid "No password provided."
+#~ msgstr "Non se indicou un contrasinal."
 
-msgid "Defaults"
-msgstr "Opcións por defecto"
+#~ msgid "No plaintext to clearsign."
+#~ msgstr "Non hai texto plano para asinar en claro."
 
-msgid "Enable snoozing for"
-msgstr "Activa-lo adiamento para"
+#~ msgid "No plaintext to verify."
+#~ msgstr "Non hai texto plano para verificar."
 
-msgid "Highlight"
-msgstr "Resaltar"
+#~ msgid "No plaintext to encrypt."
+#~ msgstr "Non hai texto plano para cifrar."
 
-msgid "Items Due Today"
-msgstr "Elementos Para Hoxe"
+#~ msgid "No recipients specified"
+#~ msgstr "Non se especificaron destinatarios."
 
-msgid "Items Not Yet Due"
-msgstr "Elementos que Aínda Non Vencen"
+#~ msgid "No ciphertext to decrypt."
+#~ msgstr "Non hai texto cifrado para descifrar."
 
-msgid "Items Not Yet Due:"
-msgstr "Elementos que Aínda Non Vencen:"
+#~ msgid "Cannot summarize folder: %s: %s"
+#~ msgstr "Non é posible resumir o cartafol: %s: %s"
 
-msgid "Overdue Items"
-msgstr "Elementos Retrasados"
+#~ msgid "Synchronising folder"
+#~ msgstr "Sincronizando cartafol"
 
-msgid "Remind me of all appointments"
-msgstr "Lembrarme todas as citas"
+#~ msgid "Could not open folder to summarize: %s: %s"
+#~ msgstr "Non foi posible abrir o cartafol para o resumir: %s: %s"
 
-msgid "Time Until Due"
-msgstr "Tempo Ata o Límite"
+#~ msgid "Could not open folder to summarise: %s: %s"
+#~ msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-msgid "Visual Alarms"
-msgstr "Alarmas Visuais"
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
 
-msgid "Work week"
-msgstr "Semana laboral"
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%Y/%m/%d"
 
-msgid "minutes before they occur."
-msgstr "minutos antes de que ocorran."
+#~ msgid "%x"
+#~ msgstr "%x"
 
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#~ msgid "Elm mail"
+#~ msgstr "Correo de Elm"
 
-msgid "Task"
-msgstr "Tarefa"
+#~ msgid "Pine mail"
+#~ msgstr "Correo de Pine"
 
-msgid "Percent complete"
-msgstr "Porcentaxe completada"
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "Fábrica para o compoñente de correo de Evolution."
 
-msgid "Transparency"
-msgstr "Transparencia"
+#~ msgid "Forwarded message:\n"
+#~ msgstr "Mensaxe remitida:\n"
 
-msgid "Mark the task complete"
-msgstr "Marcar a tarefa como completa"
+#~ msgid "Each account must have a different name."
+#~ msgstr "Cada conta ten que ter un nome diferente."
 
-msgid "Edit this task..."
-msgstr "Editar esta tarefa..."
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Debe amosarse a _previsualización da mensaxe por defecto"
 
-msgid "Edit the task"
-msgstr "Editar Tarefa"
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "A lista de mensaxes debe amosarse en modo _fío por defecto"
 
-msgid "Component successfully updated."
-msgstr "Compoñente actualizado con éxito."
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "_Lembrar o contrasinal PGP ata saír"
 
-msgid "I couldn't open your calendar file!\n"
-msgstr "¡Non foi posible abir o ficheiro da axenda!\n"
+#~ msgid "No such folder /%s"
+#~ msgstr "Non existe o cartafol /%s"
 
-msgid "I couldn't load your calendar file!\n"
-msgstr "¡Non foi posible cargar o ficheiro da axenda!\n"
+#~ msgid "Registering '%s'"
+#~ msgstr "Rexistrando '%s'"
 
-msgid "This is a reply from someone who was uninvited!"
-msgstr "¡Esta é unha resposta de alguén que non foi convidado!"
+#~ msgid "Synchronizing '%s'"
+#~ msgstr "Sincronizando '%s'"
 
-msgid "I couldn't update your calendar store."
-msgstr "¡Non foi posible actualizar o almacenamento da axenda!"
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Fábrica para o compoñente de Resume Executivo de Evolution."
 
-msgid "I couldn't delete the calendar component!\n"
-msgstr "¡Non se puido borrar o compoñente da axenda!\n"
+#~ msgid "%l:%M%p"
+#~ msgstr "%l:%M%p"
 
-msgid "Component successfully deleted."
-msgstr "Compoñente borrado con éxito."
+#~ msgid "%a %l:%M%p"
+#~ msgstr "%a %k:%M"
 
-msgid "I don't recognize this type of calendar component."
-msgstr "Non se recoñece este tipo de compoñente de axenda."
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-msgid "Add to Calendar"
-msgstr "Engadir á Axenda"
+#~ msgid "_Refresh time (seconds):"
+#~ msgstr "Tempo de _refresco (segundos):"
 
-msgid " Tentative "
-msgstr " Tentativa "
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Elimina-lo cartafol '%s'"
 
-msgid "Update Calendar"
-msgstr "Actualizar Axenda"
+#~ msgid "Rename"
+#~ msgstr "Renomear"
 
-msgid "Attendee address"
-msgstr "Enderezo do asistente"
+#~ msgid "_Debug"
+#~ msgstr "_Depuración"
 
-msgid "Attendees: "
-msgstr "Asistentes: "
+#~ msgid "_Import File..."
+#~ msgstr "_Importar Ficheiro..."
 
-msgid "Organizer: "
-msgstr "Organizador: "
+#~ msgid "All Attendees"
+#~ msgstr "Tódolos Asistentes"
 
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publicar\n"
-"Evento"
+#~ msgid "Spool stores do not have an inbox"
+#~ msgstr "Os armacenamentos de spools non teñen un inbox"
 
-msgid "All"
-msgstr "Todas"
+#~ msgid "Standard Unix mailbox file"
+#~ msgstr "Ficheiro mailbox estándar de Unix"
 
-msgid "Show a dialog"
-msgstr "Amosar un diálogo"
+#~ msgid "Unix mbox spool-format mail files"
+#~ msgstr "Ficheiros de correo con formato de spool mbox de Unix"
 
-msgid "Appointment Basics"
-msgstr "Básicos sobre Citas"
+#~ 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 sistemas de email "
+#~ "propietarios."
 
-msgid "Has category"
-msgstr "Ten a categoría"
+#~ msgid "???"
+#~ msgstr "???"
 
-msgid "Could not test lock file for %s: %s"
-msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
 
-msgid "%s is not a selectable folder"
-msgstr "O cartafol %s non é seleccionable"
+#~ msgid "_Company:"
+#~ msgstr "_Compañía:"
 
-msgid "Send as:"
-msgstr "Enviar como:"
+#~ msgid "USA"
+#~ msgstr "Estados Unidos"
 
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
+#~ msgid "As _Minicards"
+#~ msgstr "Como _Minitarxetas"
 
-msgid "That is not a regular file."
-msgstr "Ese non é un ficheiro normal."
+#~ msgid "As _Table"
+#~ msgstr "Como unha _Táboa"
 
-msgid "That file exists but is not readable."
-msgstr "O ficheiro existe pero non se pode ler."
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Non foi posible abrir este libro de enderezos. Isto\n"
+#~ "significa que introduciu un URI incorrecto, ou que se\n"
+#~ "tentou acceder a un servidor LDAP e o programa non\n"
+#~ "está compilado con soporte LDAP. Se introduciu un URI\n"
+#~ "comprobe que sexa correcto e volva introducilo.\n"
+#~ "Senón, probablemente tentou acceder a un servidor LDAP.\n"
+#~ "Se desexa poder usar LDAP, necesitará baixar e\n"
+#~ "instalar OpenLDAP e recompilar e instalar Evolution.\n"
 
-msgid "That file appeared accesible but open(2) failed."
-msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo de libro de enderezos descoñecido"
 
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"O ficheiro é moi longo (máis de 100K).\n"
-"¿Está seguro de querer inserilo?"
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Ningún (modo anónimo)"
 
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo de autenticación descoñecido"
 
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#~ msgid "Subtree"
+#~ msgstr "Subárbore"
 
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo de ámbito descoñecido"
 
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro HTML:\n"
-"%s"
+#~ msgid "Bind DN:"
+#~ msgstr "Asignar DN:"
 
-msgid "File does not have a place for the services.\n"
-msgstr "O ficheiro non ten un lugar para os servicios.\n"
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Asignar DN aquí"
 
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Pode seleccionar unha páxina HTML diferente para o fondo do Resumo "
-"Executivo.\n"
-"\n"
-"Déixeo en branco para que apareza a asignada por defecto"
+#~ msgid "FIXME Host help text here."
+#~ msgstr "AMÁÑAME Texto de axuda para Servidor aquí"
 
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s coa aplicación por defecto de GNOME"
+#~ msgid "FIXME Port help text here."
+#~ msgstr "AMÁÑAME Texto de axuda para Porto aquí"
 
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s co navegador web por defecto de GNOME"
+#~ msgid "Root DN:"
+#~ msgstr "DN Raíz:"
 
-msgid "Send an email to %s"
-msgstr "Enviar unha mensaxe a %s"
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "AMÁÑAME Texto de axuda para DN Raíz aquí"
 
-msgid "Run %s"
-msgstr "Executar %s"
+#~ msgid "Authentication:"
+#~ msgstr "Autenticación:"
 
-msgid "Close %s"
-msgstr "Pechar %s"
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Ruta aquí"
 
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Crear ruta se non existe."
 
-msgid "Move %s to the right"
-msgstr "Mover %s para a dereita"
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "Escolla a clase de Libro de Enderezos que ten, e introduza a información "
+#~ "relevante sobre el."
 
-msgid "Move %s into the previous row"
-msgstr "Mover %s á fileira anterior"
+#~ msgid "FIXME Name help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Nome aquí"
 
-msgid "Move %s into the next row"
-msgstr "Mover %s á seguinte fileira"
+#~ msgid "FIXME Description help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
 
-msgid "Background:"
-msgstr "Fondo:"
+#~ msgid "Edit"
+#~ msgstr "Editar"
 
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O compoñente Resumo Executivo non puido inicializar Bonobo.\n"
-"Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
-"significa que compilou Bonobo contra GOAD no canto de OAF."
+#~ msgid "URI"
+#~ msgstr "URI"
 
-msgid "Factory for the RDF summary."
-msgstr "Fábrica para o resumo RDF."
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
 
-msgid "RDF Summary"
-msgstr "Resume RDF"
+#~ msgid "Select name from:"
+#~ msgstr "Seleccionar nome dende:"
 
-msgid "Factory for the test bonobo component."
-msgstr "Fábrica para o compoñente bonobo de probas."
+#~ msgid "Open calendar"
+#~ msgstr "Abrir axenda"
 
-msgid "Factory for the test component."
-msgstr "Fábrica para o compoñente de probas."
+#~ msgid "Save calendar"
+#~ msgstr "Gardar axenda"
 
-msgid "Test bonobo service"
-msgstr "Comprobar servicio bonobo"
+#~ msgid "Transparent"
+#~ msgstr "Transparente"
 
-msgid "Test service"
-msgstr "Comprobar servicio"
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
 
-msgid "Update automatically"
-msgstr "Actualizar automaticamente"
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "A clasificación ten que ser 'Pública', 'Privada', 'Confidencial' ou "
+#~ "'Ningunha'"
 
-msgid "Forward to Address"
-msgstr "Reenviar ó Enderezo"
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
 
-msgid "Store search as vFolder"
-msgstr "Armacenar busca como CartafolV"
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro cargando a axenda:<br>Método non soportado"
 
-msgid "Resend"
-msgstr "Re-enviar"
+#~ msgid "Alarms timeout after"
+#~ msgstr "As alarmas saltan despois de"
 
-msgid "Evolution Account Manager"
-msgstr "Xestor de Contas de Evolution"
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Chifrar cando aparece a fiestra de alarma."
 
-msgid "On %s, %s wrote:"
-msgstr "O %s, %s escribiu:"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias da Axenda"
 
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar o cartafol \"%s\" ó formato \"%s\""
+#~ msgid "Date navigator options"
+#~ msgstr "Opcións do navegador de datas"
 
-msgid "Closing current folder"
-msgstr "Pechando o cartafol actual"
+#~ msgid "Defaults"
+#~ msgstr "Opcións por defecto"
 
-msgid "Renaming old folder and opening"
-msgstr "Renomeando o cartafol antigo e abrindo"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activa-lo adiamento para"
 
-msgid "Copying messages"
-msgstr "Copiando as mensaxes"
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
 
-msgid "Do you accept?"
-msgstr "¿Acepta?"
+#~ msgid "Items Due Today"
+#~ msgstr "Elementos Para Hoxe"
 
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elementos que Aínda Non Vencen"
 
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elementos que Aínda Non Vencen:"
 
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
+#~ msgid "Overdue Items"
+#~ msgstr "Elementos Retrasados"
 
-msgid "Receiving"
-msgstr "Recibindo"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Lembrarme todas as citas"
 
-msgid "Incomplete message written on pipe!"
-msgstr "¡Mensaxe incompleta escrita na canalización!"
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo Ata o Límite"
 
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaxe remitida)"
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas Visuais"
 
-msgid "Forwarded message (no subject)"
-msgstr "Mensaxe remitida (sen asunto)"
+#~ msgid "Work week"
+#~ msgstr "Semana laboral"
 
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaxe Remitida-----<br><b>De:</b> %s<br><b>Para:</b> %s<br><b>Asunto:"
-"</b> %s<br>"
+#~ msgid "minutes before they occur."
+#~ msgstr "minutos antes de que ocorran."
 
-msgid "Print the selected message"
-msgstr "Imprimir a mensaxe seleccionada"
+#~ msgid "Edit Task"
+#~ msgstr "Editar Tarefa"
 
-msgid "Delete this message"
-msgstr "Borrar esta mensaxe"
+#~ msgid "Task"
+#~ msgstr "Tarefa"
 
-msgid "Getting store for \"%s\""
-msgstr "Conseguindo armacenamento para \"%s\""
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaxe completada"
 
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con éxito."
+#~ msgid "Transparency"
+#~ msgstr "Transparencia"
 
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Semella que é a primeira vez que executa Evolution."
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcar a tarefa como completa"
 
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
+#~ msgid "Edit this task..."
+#~ msgstr "Editar esta tarefa..."
 
-msgid "Activate"
-msgstr "Activar"
+#~ msgid "Edit the task"
+#~ msgstr "Editar Tarefa"
 
-msgid "Activate this shortcut"
-msgstr "Activar este atallo"
+#~ msgid "Component successfully updated."
+#~ msgstr "Compoñente actualizado con éxito."
 
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#~ msgid "I couldn't open your calendar file!\n"
+#~ msgstr "¡Non foi posible abir o ficheiro da axenda!\n"
 
-msgid "View All"
-msgstr "Ver Todos"
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "¡Non foi posible cargar o ficheiro da axenda!\n"
 
-msgid "View all contacts"
-msgstr "Ver tódolos contactos"
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "¡Esta é unha resposta de alguén que non foi convidado!"
 
-msgid "5 Days"
-msgstr "5 Días"
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "¡Non foi posible actualizar o almacenamento da axenda!"
 
-msgid "Alter preferences"
-msgstr "Modifica-las preferencias"
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "¡Non se puido borrar o compoñente da axenda!\n"
 
-msgid "Create a new calendar"
-msgstr "Crear unha nova axenda"
+#~ msgid "Component successfully deleted."
+#~ msgstr "Compoñente borrado con éxito."
 
-msgid "Go to present time"
-msgstr "Ir á hora actual"
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Non se recoñece este tipo de compoñente de axenda."
 
-msgid "New _Event"
-msgstr "Novo _Evento"
+#~ msgid "Add to Calendar"
+#~ msgstr "Engadir á Axenda"
 
-msgid "Prev"
-msgstr "Ant"
+#~ msgid " Tentative "
+#~ msgstr " Tentativa "
 
-msgid "Save calendar as something else"
-msgstr "Gardar axenda como outra cousa distinta"
+#~ msgid "Update Calendar"
+#~ msgstr "Actualizar Axenda"
 
-msgid "_Day"
-msgstr "_Día"
+#~ msgid "Attendees: "
+#~ msgstr "Asistentes: "
 
-msgid "_Month"
-msgstr "_Mes"
+#~ msgid "Organizer: "
+#~ msgstr "Organizador: "
 
-msgid "_Open Calendar"
-msgstr "_Abrir Axenda"
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Publicar\n"
+#~ "Evento"
 
-msgid "Help"
-msgstr "Axuda"
+#~ msgid "All"
+#~ msgstr "Todas"
 
-msgid "See online help"
-msgstr "Ver a axuda online"
+#~ msgid "Show a dialog"
+#~ msgstr "Amosar un diálogo"
 
-msgid "About this application"
-msgstr "Acerca desta aplicación"
+#~ msgid "Appointment Basics"
+#~ msgstr "Básicos sobre Citas"
 
-msgid "About..."
-msgstr "Acerca de..."
+#~ msgid "Has category"
+#~ msgstr "Ten a categoría"
 
-msgid "Actio_ns"
-msgstr "Acció_ns"
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
 
-msgid "Address _Book... (FIXME)"
-msgstr "_Libro de Enderezos... (AMÁÑAME)"
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "O cartafol %s non é seleccionable"
 
-msgid "C_lear"
-msgstr "_Limpar"
+#~ msgid "Send as:"
+#~ msgstr "Enviar como:"
 
-msgid "Chec_k Names (FIXME)"
-msgstr "Comproba_r Nomes (AMÁÑAME)"
+#~ msgid "That is not a regular file."
+#~ msgstr "Ese non é un ficheiro normal."
 
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#~ msgid "That file exists but is not readable."
+#~ msgstr "O ficheiro existe pero non se pode ler."
 
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_iar ao Cartafol... (AMÁÑAME)"
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
 
-msgid "Dump XML"
-msgstr "Envorcar XML"
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O ficheiro é moi longo (máis de 100K).\n"
+#~ "¿Está seguro de querer inserilo?"
 
-msgid "Dump the UI Xml description"
-msgstr "Envorcar a descrición Xml da Interface"
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
 
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimeiro Obxecto no Cartafol (AMÁÑAME)"
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
 
-msgid "For_ward (FIXME)"
-msgstr "Re_mitir (AMÁÑAME)"
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
 
-msgid "Go to the next item"
-msgstr "Ir ó elemento seguinte"
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
 
-msgid "Go to the previous item"
-msgstr "Ir ó elemento anterior"
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro HTML:\n"
+#~ "%s"
 
-msgid "In_complete Task (FIXME)"
-msgstr "Tarefa In_completa (AMÁÑAME)"
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "O ficheiro non ten un lugar para os servicios.\n"
 
-msgid "N_ext"
-msgstr "Se_guinte"
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Pode seleccionar unha páxina HTML diferente para o fondo do Resumo "
+#~ "Executivo.\n"
+#~ "\n"
+#~ "Déixeo en branco para que apareza a asignada por defecto"
 
-msgid "Pre_vious"
-msgstr "An_terior"
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s coa aplicación por defecto de GNOME"
 
-msgid "Print S_etup..."
-msgstr "_Configuración da Impresión..."
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s co navegador web por defecto de GNOME"
 
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de diálogo"
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar unha mensaxe a %s"
 
-msgid "Schedule some sort of a meeting"
-msgstr "Programar algunha clase de reunión"
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
 
-msgid "Select everything"
-msgstr "Seleccionar todo"
+#~ msgid "Close %s"
+#~ msgstr "Pechar %s"
 
-msgid "_About..."
-msgstr "_Acerca de..."
+#~ msgid "Move %s to the left"
+#~ msgstr "Mover %s para a esquerda"
 
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AMÁÑAME)"
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a dereita"
 
-msgid "_Item (FIXME)"
-msgstr "_Elemento (AMÁÑAME)"
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s á fileira anterior"
 
-msgid "_Journal Entry (FIXME)"
-msgstr "_Entrada de Diario (AMÁÑAME)"
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s á seguinte fileira"
 
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Derradeiro Elemento do Cartafol (AMÁÑAME)"
+#~ msgid "Background:"
+#~ msgstr "Fondo:"
 
-msgid "_Mail Message (FIXME)"
-msgstr "Enviar _Mensaxe (AMÁÑAME)"
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O compoñente Resumo Executivo non puido inicializar Bonobo.\n"
+#~ "Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
+#~ "significa que compilou Bonobo contra GOAD no canto de OAF."
 
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mover ao Cartafol ... (AMÁÑAME)"
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fábrica para o resumo RDF."
 
-msgid "_Note (FIXME)"
-msgstr "_Nota (AMÁÑAME)"
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
 
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AMÁÑAME)"
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fábrica para o compoñente bonobo de probas."
 
-msgid "_Unread Item (FIXME)"
-msgstr "_Obxecto non Lido (AMÁÑAME)"
+#~ msgid "Factory for the test component."
+#~ msgstr "Fábrica para o compoñente de probas."
 
-msgid "Add Service"
-msgstr "Engadir Servicio"
+#~ msgid "Test bonobo service"
+#~ msgstr "Comprobar servicio bonobo"
 
-msgid "Add a new service to the Executive Summary"
-msgstr "Engadir un novo servicio ao Resumo Executivo"
+#~ msgid "Test service"
+#~ msgstr "Comprobar servicio"
 
-msgid "Create a new email"
-msgstr "Crear unha nova mensaxe"
+#~ msgid "Update automatically"
+#~ msgstr "Actualizar automaticamente"
 
-msgid "Apply any new filters to the mail in this box"
-msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar ó Enderezo"
 
-msgid "Configure Folder..."
-msgstr "_Configurar Cartafol..."
+#~ msgid "Store search as vFolder"
+#~ msgstr "Armacenar busca como CartafolV"
 
-msgid "Copy message to a new folder"
-msgstr "Copiar a mensaxe a un novo cartafol"
+#~ msgid "Resend"
+#~ msgstr "Re-enviar"
 
-msgid "Display all of the message headers"
-msgstr "Amosar todas as cabeceiras da mensaxe"
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Xestor de Contas de Evolution"
 
-msgid "Expunge"
-msgstr "Limpar"
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "O %s, %s escribiu:"
 
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borrar"
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar o cartafol \"%s\" ó formato \"%s\""
 
-msgid "Forward inline"
-msgstr "Remitir inline"
+#~ msgid "Closing current folder"
+#~ msgstr "Pechando o cartafol actual"
 
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Remitir esta mensaxe in-line coa súa, para poder editala"
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando o cartafol antigo e abrindo"
 
-msgid "Invert Selection"
-msgstr "Inverter Selección"
+#~ msgid "Do you accept?"
+#~ msgstr "¿Acepta?"
 
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _Subscripcións"
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
 
-msgid "Mark As Read"
-msgstr "Marcar como Lida"
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
 
-msgid "Mark As U_nread"
-msgstr "Marcar como _Non Lida"
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
 
-msgid "Move message to a new folder"
-msgstr "Mover mensaxe a un novo cartafol"
+#~ msgid "Receiving"
+#~ msgstr "Recibindo"
 
-msgid "Print Preview of message..."
-msgstr "Previsualización da Impresión da mensaxe..."
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "¡Mensaxe incompleta escrita na canalización!"
 
-msgid "Print message to the printer"
-msgstr "Imprimir mensaxe na impresora"
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaxe remitida)"
 
-msgid "Print message..."
-msgstr "Imprimir mensaxe..."
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaxe remitida (sen asunto)"
 
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redireccionar (AMÁÑAME: impleméntame)"
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaxe Remitida-----<br><b>De:</b> %s<br><b>Para:</b> %"
+#~ "s<br><b>Asunto:</b> %s<br>"
 
-msgid "Reply to all"
-msgstr "Responder a todos"
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimir a mensaxe seleccionada"
 
-msgid "Reply to sender"
-msgstr "Responder ó autor"
+#~ msgid "Delete this message"
+#~ msgstr "Borrar esta mensaxe"
 
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Enviar unha resposta á persoa que enviou esta mensaxe"
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Conseguindo armacenamento para \"%s\""
 
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Enviar unha única mensaxe en resposta a todo o correo seleccionado"
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros de Evolution instalados con éxito."
 
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"Enviar o correo na cola\n"
-"    e recibir o correo novo"
+#~ msgid "This seems to be the first time you are running Evolution."
+#~ msgstr "Semella que é a primeira vez que executa Evolution."
 
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#~ msgid "Please click \"OK\" to install the Evolution user files under"
+#~ msgstr ""
+#~ "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-msgid "View Raw Message Source"
-msgstr "Ver o Código Fonte sen Procesar da Mensaxe"
+#~ msgid "Activate"
+#~ msgstr "Activar"
 
-msgid "_Reply"
-msgstr "_Responder"
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atallo"
 
-msgid "_Save Message As..."
-msgstr "_Gardar Mensaxe Como..."
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
 
-msgid "_Threaded"
-msgstr "_Por fíos"
+#~ msgid "View All"
+#~ msgstr "Ver Todos"
 
-msgid "Save in _folder... (FIXME)"
-msgstr "Gardar no _cartafol... (AMÁÑAME)"
+#~ msgid "View all contacts"
+#~ msgstr "Ver tódolos contactos"
 
-msgid "Send the message now"
-msgstr "Enviar a mensaxe agora"
+#~ msgid "5 Days"
+#~ msgstr "5 Días"
 
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir ficheiro de texto... (AMÁÑAME)"
+#~ msgid "Alter preferences"
+#~ msgstr "Modifica-las preferencias"
 
-msgid "Redo"
-msgstr "Refacer"
+#~ msgid "Create a new calendar"
+#~ msgstr "Crear unha nova axenda"
 
-msgid "Redo the undone action"
-msgstr "Refacer a acción desfeita"
+#~ msgid "Go to present time"
+#~ msgstr "Ir á hora actual"
 
-msgid "Replace"
-msgstr "Substituír"
+#~ msgid "New _Event"
+#~ msgstr "Novo _Evento"
 
-msgid "Replace a string"
-msgstr "Substituír unha cadea"
+#~ msgid "Prev"
+#~ msgstr "Ant"
 
-msgid "Reply to A_ll (FIXME)"
-msgstr "Responder a _Todos (AMÁÑAME)"
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gardar axenda como outra cousa distinta"
 
-msgid "S_end Status Report (FIXME)"
-msgstr "_Mandar Informe de Estado (AMÁÑAME)"
+#~ msgid "_Day"
+#~ msgstr "_Día"
 
-msgid "S_kip Occurrence (FIXME)"
-msgstr "S_altarse a Ocorrencia (AMÁÑAME)"
+#~ msgid "_Month"
+#~ msgstr "_Mes"
 
-msgid "Search again for the same string"
-msgstr "Buscar novamente a mesma cadea"
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir Axenda"
 
-msgid "Undo"
-msgstr "Desfacer"
+#~ msgid "Help"
+#~ msgstr "Axuda"
 
-msgid "Undo the last action"
-msgstr "Desfacer a última acción"
+#~ msgid "See online help"
+#~ msgstr "Ver a axuda online"
 
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AMÁÑAME)"
+#~ msgid "About this application"
+#~ msgstr "Acerca desta aplicación"
 
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcar como Completa (AMÁÑAME)"
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
 
-msgid "_Reply (FIXME)"
-msgstr "_Responder (AMÁÑAME)"
+#~ msgid "Actio_ns"
+#~ msgstr "Acció_ns"
 
-msgid "Save task as something else"
-msgstr "Gardar a tarefa como outra cousa distinta"
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Libro de Enderezos... (AMÁÑAME)"
 
-msgid "Tasks Preferences..."
-msgstr "Preferencias das Tarefas..."
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Comproba_r Nomes (AMÁÑAME)"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Pechar esta cita"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_iar ao Cartafol... (AMÁÑAME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Envorcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Envorcar a descrición Xml da Interface"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimeiro Obxecto no Cartafol (AMÁÑAME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Re_mitir (AMÁÑAME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Ir ó elemento seguinte"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir ó elemento anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Tarefa In_completa (AMÁÑAME)"
+
+#~ msgid "N_ext"
+#~ msgstr "Se_guinte"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Configuración da Impresión..."
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Gardar a cita e pechar a caixa de diálogo"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programar algunha clase de reunión"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto (AMÁÑAME)"
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Elemento (AMÁÑAME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Entrada de Diario (AMÁÑAME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Derradeiro Elemento do Cartafol (AMÁÑAME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "Enviar _Mensaxe (AMÁÑAME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mover ao Cartafol ... (AMÁÑAME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (AMÁÑAME)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tarefa (AMÁÑAME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Obxecto non Lido (AMÁÑAME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Engadir Servicio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Engadir un novo servicio ao Resumo Executivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crear unha nova mensaxe"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "_Configurar Cartafol..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar a mensaxe a un novo cartafol"
+
+#~ msgid "Display all of the message headers"
+#~ msgstr "Amosar todas as cabeceiras da mensaxe"
+
+#~ msgid "Expunge"
+#~ msgstr "Limpar"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borrar"
+
+#~ msgid "Forward inline"
+#~ msgstr "Remitir inline"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Remitir esta mensaxe in-line coa súa, para poder editala"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Inverter Selección"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Xestionar _Subscripcións"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Marcar como Lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _Non Lida"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaxe a un novo cartafol"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualización da Impresión da mensaxe..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir mensaxe na impresora"
+
+#~ msgid "Print message..."
+#~ msgstr "Imprimir mensaxe..."
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redireccionar (AMÁÑAME: impleméntame)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Responder a todos"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Responder ó autor"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Enviar unha resposta á persoa que enviou esta mensaxe"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Enviar unha única mensaxe en resposta a todo o correo seleccionado"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Enviar o correo na cola\n"
+#~ "    e recibir o correo novo"
+
+#~ msgid "Show _All"
+#~ msgstr "Amosar _Todo"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver o Código Fonte sen Procesar da Mensaxe"
+
+#~ msgid "_Reply"
+#~ msgstr "_Responder"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gardar Mensaxe Como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Por fíos"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gardar no _cartafol... (AMÁÑAME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar a mensaxe agora"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir ficheiro de texto... (AMÁÑAME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refacer a acción desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "Substituír"
+
+#~ msgid "Replace a string"
+#~ msgstr "Substituír unha cadea"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Responder a _Todos (AMÁÑAME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Mandar Informe de Estado (AMÁÑAME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "S_altarse a Ocorrencia (AMÁÑAME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente a mesma cadea"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a última acción"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (AMÁÑAME)"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcar como Completa (AMÁÑAME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Responder (AMÁÑAME)"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Gardar a tarefa como outra cousa distinta"
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Preferencias das Tarefas..."
 
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar Barras de Tarefas..."
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zar Barras de Tarefas..."
 
-msgid "Customize"
-msgstr "Personalizar"
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
 
-msgid "Customize toolbars"
-msgstr "Personaliza-las barras de tarefas"
+#~ msgid "Customize toolbars"
+#~ msgstr "Personaliza-las barras de tarefas"
 
-msgid "Evolution bar _shortcut"
-msgstr "_Atallo da barra de Evolution"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Atallo da barra de Evolution"
 
-msgid "Getting _Started"
-msgstr "_Iniciación"
+#~ msgid "Getting _Started"
+#~ msgstr "_Iniciación"
 
-msgid "Using the C_ontact Manager"
-msgstr "Uso do Xestor de Co_ntactos"
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso do Xestor de Co_ntactos"
 
-msgid "Using the _Calendar"
-msgstr "Uso da _Axenda"
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso da _Axenda"
 
-msgid "Using the _Mailer"
-msgstr "Uso do Cliente de _Correo"
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso do Cliente de _Correo"
 
-msgid "_Index"
-msgstr "Í_ndice"
+#~ msgid "_Index"
+#~ msgstr "Í_ndice"
 
-msgid "Advanced ..."
-msgstr "Avanzadas..."
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzadas..."