Sync for 0.13.

svn path=/trunk/; revision=12408

1 files changed, 4318 insertions, 2271 deletions

diff --git a/po/gl.po b/po/gl.po
index ff2e326e2c..cc9a239805 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,10 +9,11 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -30,11 +31,11 @@ msgstr "Fábrica para importar ficheiros GnomeCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros GnomeCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -42,7 +43,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -50,7 +51,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -58,7 +59,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -66,7 +67,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -74,7 +75,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -82,7 +83,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -90,7 +91,7 @@ msgstr ""
 "\n"
 "Data de nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -98,7 +99,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -106,7 +107,7 @@ msgstr ""
 "\n"
 "  Apdo. de correos: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -114,7 +115,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -122,7 +123,7 @@ msgstr ""
 "\n"
 "  Rúa:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -130,7 +131,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
@@ -138,7 +139,7 @@ msgstr ""
 "\n"
 "  Rexión:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -146,7 +147,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -154,7 +155,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
@@ -162,7 +163,7 @@ msgstr ""
 "\n"
 "Etiqueda de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -170,7 +171,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -178,7 +179,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -186,7 +187,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -194,7 +195,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -202,7 +203,7 @@ msgstr ""
 "\n"
 "Cliente de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -210,7 +211,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -218,7 +219,7 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -226,7 +227,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -234,7 +235,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -242,7 +243,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -250,7 +251,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -258,7 +259,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -266,7 +267,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -274,7 +275,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -282,7 +283,7 @@ msgstr ""
 "\n"
 "Categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -300,7 +301,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -308,7 +309,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -330,8 +331,8 @@ msgstr "Introduza o contrasinal %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: 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
@@ -346,20 +347,20 @@ msgstr "Non foi posible cargar o cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: calendar/conduits/calendar/calendar-conduit.c:778
 #: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:655
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 #, fuzzy
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo de pilot"
@@ -408,203 +409,213 @@ msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Fábrica para a mostra de control do Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Ficheiro"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo de libro de enderezos descoñecido"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ningún (modo anónimo)"
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
-msgid "Password"
-msgstr "Contrasinal"
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"Erro cargando a información do filtro:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tipo de autenticación descoñecido"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Único"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Subárbore"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Tipo de ámbito descoñecido"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Editar o Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Asignar ND:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "AMÁÑAME Texto de axuda para Asignar ND aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Conta"
 
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr "Lembrar este contrasinal"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Engadir Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Servidor:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Engadir Fontes para o Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "AMÁÑAME Texto de axuda para Servidor aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "ND Raíz:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "AMÁÑAME Texto de axuda para ND Raíz aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Porto:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "Eliminar"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "AMÁÑAME Texto de axuda para Porto aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "Único"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 msgstr "Buscar Ámbito:"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autenticación:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Camiño:"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "Buscar Ámbito:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "AMÁÑAME Texto de axuda para Camiño aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "Seleccionar Nomes"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Crear camiño se non existe."
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Editar o Libro de Enderezos"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Engadir Libro de Enderezos"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"Elixe a clase de Libro de Enderezos que tes, e introduce a información "
-"relevante sobre el."
 
-#: addressbook/gui/component/addressbook-config.c:691
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
-msgstr "AMÁÑAME Texto de axuda para Nome aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:694
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Descrición:"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
-msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Engadir Fontes para o Libro de Enderezos"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, fuzzy
-msgid "De_lete"
-msgstr "Eliminar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
+msgid "_Account name:"
+msgstr "Xestión e Contas"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:108
+#: 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
 msgid "_Add"
 msgstr "_Engadir"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: 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:46
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "O servidor require autenticación"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Porto:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Mensaxe de servidor:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduza o contrasinal %s"
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Introduza o seu contrasinal %s para %s"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Autenticación"
+
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "Enderezo de Correo-E:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Contrasinal"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -612,48 +623,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Nome contén"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Enderezo contén"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Nome contén"
+msgid "Category is"
+msgstr "Categorías"
 
-#: addressbook/gui/component/addressbook.c:707
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 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
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Categoría:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o Navegador de Cartafoles"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Sen nome)"
+
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1537
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: 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:1538
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: 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"
 
@@ -677,19 +713,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "Editar o Libro de Enderezos"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: 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:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "Editar Información de Contacto"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: 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:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Enderezo de Correo-E:"
@@ -713,13 +749,10 @@ msgstr ""
 "Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:630
+#: 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:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:481
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Quitar"
 
@@ -732,37 +765,56 @@ msgstr "Quitar Todos"
 msgid "Send HTML Mail?"
 msgstr "Enviando Correo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Destinatarios da mensaxe"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "contén"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Seleccionar Nomes"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "_Contacto"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Seleccionar nome desde:"
+msgid "F_ind"
+msgstr "Buscar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "_Category:"
 msgstr "Categoría:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Buscar"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "_Cartafol"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Destinatarios da mensaxe"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -777,8 +829,8 @@ msgid "Business _Fax"
 msgstr "_Fax do traballo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
@@ -787,16 +839,16 @@ msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detalles"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "Arquivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Xeral"
 
@@ -821,240 +873,1241 @@ msgstr "Tipos de teléfono"
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Enderezo da páxina Web:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: 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:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Nome do _Xestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Móbil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Este é o enderezo da lista de correo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Enderezo da páxina Web:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "¿Borrar Contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: 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:1495
 #: 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:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: 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:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Reincorporación"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Automóbil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: 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:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: 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:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: 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:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Móbil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: 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:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: 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:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: 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:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: 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:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Non foi posible borrar o ficheiro de resume de cartafol `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Asistente"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automático"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Orientación"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "agosto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "anos"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Tamaño"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Enviando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Canadá"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Presidir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Comprobar Enderezo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Ficheiro"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Presidir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Cores"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Copiando"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_País:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "Estados Unidos"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Cancelada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "semana"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Canadá"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Xeral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "horas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Domingo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "A máis baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "A máis baixa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "marzo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marxes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "maio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Luns"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Móbil"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Xestor"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Nova Mensaxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Seleccionar _Fío"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "Novo contacto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nova Mensaxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Alta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "abril"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuto"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "Agora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Pegar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Canadá"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papel"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Vertical"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "despois"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Seccións:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Canadá"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "Puntuación"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Xeral"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"Programar\n"
+"Hora"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "Enviar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Sobrenome"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Vista"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Radio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tarefas"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finlandia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Para"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Hoxe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Mar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Lixo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Canadá"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Múltiples Mensaxes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Vista"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Código _Postal:"
 
@@ -1145,6 +2198,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Quitar"
@@ -1155,7 +2209,7 @@ msgid "contact-list-editor"
 msgstr "Editor de contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Editor de contactos"
@@ -1165,7 +2219,7 @@ msgid "Add Anyway"
 msgstr ""
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1187,25 +2241,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Outros Contactos"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-msgid "_Change Anyway"
-msgstr ""
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "Búsqueda Avanzada"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Buscar"
 
@@ -1317,42 +2377,52 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
-msgid "Send contact to other"
-msgstr "Enviar contacto a outro"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Re-enviar Como"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "Configuración da Impresión"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: 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
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1369,7 +2439,8 @@ msgid "Success"
 msgstr "Fontes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -1378,7 +2449,7 @@ msgstr "Erro descoñecido"
 msgid "Repository offline"
 msgstr "Traballar desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1397,8 +2468,11 @@ msgid "Protocol not supported"
 msgstr "Operación non soportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: 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
+msgid "Cancelled"
 msgstr "Cancelada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1427,135 +2501,135 @@ msgid "Error removing list"
 msgstr "Erro cargando %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "Erro lendo os datos:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* Prema aquí para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "Teléfono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Teléfono de Negocios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "Teléfono de Reincorporación"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Teléfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Teléfono Automóbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Teléfono Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Outro Teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Sobrenome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Cónxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr "URL libre-ocupada"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Feito"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Cargando axenda..."
@@ -1752,6 +2826,23 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "Fonte..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimir Axenda"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimir Axenda"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Configuración da Impresión"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1912,7 +3003,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar Bonobo"
@@ -1921,151 +3012,142 @@ msgstr "Non foi posible inicializar Bonobo"
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacin de alarma"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+#: 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
 msgid "%a %d %b"
 msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B de %Y"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. 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
+msgid "%d %B"
+msgstr "%d de %b"
+
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Non foi posible crear o visor da axenda. Comproba a túa configuración de "
 "ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Descoñecido"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Público"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+#: 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:648
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1708
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+#: 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:647
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+#: 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:646
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
-#: calendar/gui/e-calendar-table.c:383
-msgid "Transparent"
-msgstr "Transparente"
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "semana"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
-msgstr "Opaco"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405
+#: 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/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Completada"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Cancelada"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2076,29 +3158,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"A clasificación ten que ser 'Pública', 'Privada', 'Confidencial' ou "
-"'Ningunha'"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
-#: calendar/gui/calendar-model.c:1291
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
-#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
-#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
-#: widgets/misc/e-dateedit.c:1471
-msgid "None"
-msgstr "Nada"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2108,42 +3168,49 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 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:1168
+#: 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:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: 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"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: 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
+msgid "None"
+msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Recurrindo"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: 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
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Non"
 
@@ -2167,30 +3234,87 @@ msgstr "Definir Vistas"
 msgid "Month View"
 msgstr "Mes"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "O resume contén"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "Descrición:"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "O comentario contén"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "Axenda"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "CartafolV sobre a Lista de Correo"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/component-factory.c:408 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
+#, fuzzy
+msgid "New _Task"
+msgstr "Nova Tarefa"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosará a axenda"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinatarios da mensaxe"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Opcións de Vista"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2242,121 +3366,127 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "%d días"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " un día"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " unha semana"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " unha hora"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " un minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " un segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Mostrar todas as cabeceiras da mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: 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:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr " antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr " despois do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr " antes da fin desta cita"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr " despois da fin desta cita"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
 msgid "Basics"
 msgstr "Base"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Data e hora"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resume:"
 
@@ -2365,12 +3495,11 @@ msgstr "Resume:"
 msgid "_Options..."
 msgstr "_Opcións"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "antes"
 
@@ -2387,7 +3516,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -2404,204 +3533,230 @@ msgid "10 minutes"
 msgstr "10 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutos"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_Preferencias de Correo..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "Chifrar cando aparece a fiestra de alarma."
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "Axenda"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "Crear unha nova cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "Preferencias da Axenda"
+#, fuzzy
+msgid "Days"
+msgstr "Día"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "Primeiro día da semana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Venres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Comprimir fins de semana"
+msgid "Minutes"
+msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "Opcións do navegador de Citas"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Luns"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Opcións por defecto"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "Retrasar Cousas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "Visualizar"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Sábado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "Final do día:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "Amosar os prazos finais das citas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "Primeiro día da semana:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "Amosar números de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "Ven"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "Inicio do día:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Venres"
+#, fuzzy
+msgid "Su_n"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domingo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "Lun"
+#, fuzzy
+msgid "T_hu"
+msgstr "Xov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Luns"
+#, fuzzy
+msgid "T_ue"
+msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Cousas esperadas para hoxe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "Retrasar Cousas"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Xoves"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Lembrarme todas as citas"
+#, fuzzy
+msgid "Time"
+msgstr "Título"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"Zona horaria: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "Sáb"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Divisións da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Sábado"
+msgid "Time format:"
+msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "Amosar os prazos finais das citas"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "Amosar números de semana"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Mércores"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "Inicio do día:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana Lab_oral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "Dom"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 horas (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Domingo"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "Tarefas"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "Cousas esperadas para hoxe"
+msgid "_Compress weekends in month view"
+msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "Xov"
+#, fuzzy
+msgid "_Display"
+msgstr "Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Xoves"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Final do día:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "Título"
+msgid "_Fri"
+msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "Divisións da hora:"
+#, fuzzy
+msgid "_General"
+msgstr "Xeral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "Formato da hora:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Agochar Mensaxes Borradas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Zona horaria: "
+msgid "_Mon"
+msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "Mar"
+#, fuzzy
+msgid "_Other"
+msgstr "Outro"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Martes"
+#, fuzzy
+msgid "_Sat"
+msgstr "Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "Mér"
+#, fuzzy
+msgid "_Task List"
+msgstr "Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Mércores"
+#, fuzzy
+msgid "_Wed"
+msgstr "Mér"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "Semana Lab_oral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minutos antes de que ocorran."
+msgid "before the start of the appointment"
+msgstr " antes do comezo da cita"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2666,64 +3821,59 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Completada"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Completada"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Cita Agardada"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2731,13 +3881,13 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2783,44 +3933,35 @@ msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Seleccionar un ficheiro"
+msgid "Addressbook..."
+msgstr "Engadir Libro de Enderezos"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "Seccións:"
+msgid "Delegate To:"
+msgstr "Eliminada"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 #, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Zona horaria: "
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
-msgstr ""
+msgid "Enter Delegate"
+msgstr "Eliminada"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Recurrencia"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancelar Reunión"
@@ -2829,175 +3970,191 @@ msgstr "Cancelar Reunión"
 msgid "A_ll day event"
 msgstr "Evento de día comp_leto"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "Ocupado"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificación"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Data e hora"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "semana"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Amosar"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "_Resume:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Nome do grupo:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Orixe do papel:"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
 msgid "Chair"
 msgstr "Presidir"
 
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
+#: 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:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: 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:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: 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:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "Engadir acción"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, fuzzy
 msgid "Accepted"
 msgstr " Aceptar "
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 msgid "Declined"
 msgstr " Rexeitar "
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: 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:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Eliminada"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "En Progreso"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Teléfono Automóbil"
 
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participante Opcional"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Non-Participante"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Enviada"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Eliminar..."
@@ -3041,19 +4198,18 @@ msgid "Role"
 msgstr "Posto"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
@@ -3099,13 +4255,14 @@ msgstr "no"
 msgid "th"
 msgstr "4º"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Engadir"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3116,26 +4273,33 @@ msgid "Exceptions"
 msgstr "Excepcións"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr "Sen recurrencia"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regra de Recurrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Recurrencia personalizada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Modificar"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "Sen recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "Recurrencia simple"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "para"
@@ -3177,167 +4341,163 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr "Data Completada:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
-msgid "Delegated From:"
-msgstr "Eliminada"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Eliminada"
+msgid "Date Completed:"
+msgstr "Data Completada:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Nada"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "En Progreso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "En Progreso"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Asignada"
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descrición:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "_Due Date:"
 msgstr "_Data Estimada:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_Prioridade:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "_Estado:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
-#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: 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
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
-#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: 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
+#: 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:856 calendar/gui/e-day-view.c:3313
-#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
-#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: 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
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Borrar esta tarefa"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 msgstr "Prema aquí para engadir unha tarefa"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "% Comp_leta:"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
@@ -3372,23 +4532,23 @@ msgstr "Posición xeográfica"
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr "Transparencia"
-
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL:"
@@ -3400,155 +4560,264 @@ 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:1330
+#: 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
 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:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Nova Cita"
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Novo Evento de día _completo"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir á Data"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Borrar Todas as Ocurrencias"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "_Este é o enderezo da lista de correo"
+msgid "Meeting Information"
+msgstr "Información Opcional"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
-msgstr ""
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Cancelar Reunión"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora do _final da reunión:"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Esta mensaxe non está dispoñible actualmente."
+msgid "Meeting Update Request"
+msgstr "_Solicitude de Reunión (AMÁÑAME)"
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "_Este é o enderezo da lista de correo"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Cancelar Reunión"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Seleccionar un ficheiro"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Editar Mensaxe"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Información"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Rota de Tarefas"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "foi posterior a"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "_Petición de Tarefa (AMÁÑAME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "O cartafol parece estar corrompido sen recuperación posible."
+msgid "Task Cancellation"
+msgstr "Cancelar Reunión"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Mensaxe da Axenda"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Información Requerida"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Información Requerida"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL libre-ocupada"
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL libre-ocupada"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Imprimir Mensaxe"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "¡Non foi posible actualizar o ficheiro da axenda!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Data Completada:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "¡Non foi posible abir o ficheiro da axenda!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Data de envío"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3586,44 +4855,27 @@ msgstr "data-finalización"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
-#: calendar/gui/e-tasks.c:629
-msgid "All"
-msgstr "Todas"
-
-#: calendar/gui/e-tasks.c:252
-msgid "Category:"
-msgstr "Categoría:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:230
-msgid "%d %B"
-msgstr "%d de %b"
-
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova Cita..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
@@ -3649,43 +4901,43 @@ msgid "Go To Date"
 msgstr "Ir á Data"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ir a hoxe"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "xaneiro"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "xullo"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "xuño"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "maio"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "novembro"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "outubro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Ir a hoxe"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3841,12 +5093,6 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
-#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tarefas"
-
 #. Day
 #: calendar/gui/print.c:1815
 #, fuzzy
@@ -3884,9 +5130,8 @@ msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:10
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
@@ -3899,7 +5144,7 @@ msgstr "Imprimir este elemento"
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
@@ -3945,6 +5190,103 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+
+#: calendar/pcs/query.c:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "Erro de sintaxe nos parámetros ou argumentos"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr ""
+
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Non está soportado asinar por este cifrado"
@@ -4004,6 +5346,7 @@ msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
@@ -4040,7 +5383,7 @@ msgstr "Erro analizando o filtro: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Erro executando o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro executando búsqueda por filtro: %s: %s"
@@ -4067,12 +5410,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(coinciden-todas) require un único resultado booleano"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inválido nos contidos do corpo, agardábase unha cadea"
 
@@ -4188,13 +5531,13 @@ msgid "No plaintext to sign."
 msgstr "Non hai texto plano para asinar."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
-#: camel/camel-pgp-context.c:1295
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
@@ -4212,15 +5555,15 @@ msgstr "Non hai texto plano para verificar."
 msgid "Couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "Non hai texto plano para encriptar."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Non se especificaron destinatarios."
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "Non hai texto cifrado para desencriptar."
 
@@ -4255,7 +5598,7 @@ msgid "Connection cancelled"
 msgstr "Conexión Cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: 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"
@@ -4266,7 +5609,7 @@ msgstr "(máquina descoñecida)"
 
 #: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
 #: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:382
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
@@ -4403,42 +5746,69 @@ msgstr "Esta opción conectarase ó servidor usando un simple contrasinal."
 msgid "Unknown authentication state."
 msgstr "Estado de autenticación descoñecido."
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr "Contrasinal"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Fontes"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilación da espresión regular: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, 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:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiño"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na búsqueda do nome: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na búsqueda do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na búsqueda do servidor: %s: motivo descoñecido"
@@ -4451,12 +5821,12 @@ msgstr "Fornecedor de correo do cartafol virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo como petición de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, 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:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4503,7 +5873,7 @@ msgstr "Fallo na mensaxe %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4511,7 +5881,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4564,61 +5934,61 @@ msgstr "Non existe a mensaxe: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non podes copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de máis."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible cargar resume para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Gardando as mensaxes"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Gardando as mensaxes"
@@ -4633,7 +6003,7 @@ 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:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -4641,7 +6011,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -4683,7 +6053,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticación %s pedida."
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: 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"
@@ -4694,7 +6064,7 @@ 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/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
@@ -4709,12 +6079,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4806,7 +6176,7 @@ 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-mbox-folder.c:322
+#: 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
@@ -4820,7 +6190,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4893,20 +6263,20 @@ msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: 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
@@ -4918,12 +6288,12 @@ msgstr ""
 "Non é posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
@@ -4971,13 +6341,14 @@ msgstr "O cartafol `%s' non está baleiro. Non borrado."
 #. 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"
+#, fuzzy
+msgid "Summarizing folder"
 msgstr "Resumindo 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: summarizing from position %ld: %s"
 msgstr ""
 "Non foi posible abir o cartafol: %s: resumindo desde a posición %ld: %s"
 
@@ -4989,24 +6360,22 @@ msgstr ""
 "Erro fatal do analizador de correo preto da posición %ld no cartafol %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "Non é posible resumir o cartafol: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Sincronizando cartafol"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5110,6 +6479,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: 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
@@ -5199,40 +6579,40 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resume de POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 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:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "Non existe a mensaxe con UID %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Recibindo a mensaxe POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "Non existe a mensaxe con UID %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recibindo a mensaxe POP %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Almacenamento da mensaxe"
@@ -5246,7 +6626,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s día(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5340,7 +6720,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5395,7 +6775,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5405,126 +6785,126 @@ msgstr ""
 "Para entregar correo por conexión a un servidor de correo remoto usando "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non recoñecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parámetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "Parámetro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 #, fuzzy
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "Mensaxe de Axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio non dispoñible, pechando a canle de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo pedida exitosa, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non é local; re-enviarase a <camiño-de-reenvío>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "A acción de correo pedida non foi levada a cabo: caixa de correo non "
 "dispoñible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acción pedida non foi levada a cabo: caixa de correo non dispoñible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "Acción pedida abortada: erro ao procesar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; téntao con <camiño-de-reenvío>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "A acción pedida non foi levada a cabo: insuficiente almacenamento no sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "A acción pedida foi abortada: excedeu a asignación de almacenamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "A acción pedida non foi levada a cabo: nome de mailbox non permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comeza a entrada da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "Fallo na transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "Necesítase un contrasinal para a transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticación é feble de máis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Necesítase encriptación para o mecanismo de autenticación pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5535,127 +6915,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "A petición HELO expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr "Erro creando o obxecto de autenticación SASL."
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "Erro creando o obxecto de autenticación SASL."
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petición AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "A petición AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticación do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "A petición MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "A petición RCPT TO expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A petición DATA expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "O envío de DATA expirou: rematando mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Erro na resposta DATA: rematando a mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petición RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
@@ -5685,7 +7065,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "anexo"
 
@@ -5718,52 +7098,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 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:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5792,30 +7172,30 @@ msgid ""
 "%s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Advertencia"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5823,17 +7203,17 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "¿Gustaríalle usar o cartafol de borradores por defecto?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5842,7 +7222,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5851,7 +7231,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5860,16 +7240,16 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gústaríalle importalos a Evolution?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5879,25 +7259,25 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: 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:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "Inserir ficheiro de texto..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Non foi posible crear a fiestra do compositor"
@@ -5929,59 +7309,105 @@ msgstr "tarxeta de enderezo"
 msgid "calendar information"
 msgstr "información de axenda"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "contén"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "non contén"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "O comentario contén"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Nome contén"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Destinatarios"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Nome contén"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Nome contén"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "non contén"
+
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:239
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 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:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
-#: widgets/misc/e-dateedit.c:1512
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%a %d/%m/%Y"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5989,14 +7415,14 @@ 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:303
+#: e-util/e-time-utils.c:313
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -6095,7 +7521,7 @@ msgstr "unha hora relativa á hora actual"
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "agora"
 
@@ -6107,11 +7533,16 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
@@ -6132,20 +7563,20 @@ msgstr ""
 "Oops, esqueceu escoller un cartafol.\n"
 "Volva atrás e especifique un cartafol válido no que deixar o correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Introduza o URI do cartafol"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6166,62 +7597,51 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sen_título"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "saínte"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
-msgid "Add"
-msgstr "Engadir"
-
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
-msgid "Edit"
-msgstr "Editar"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Editar CartafolesV"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Entrante"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Saínte"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Cartafoles Virtuais"
 
@@ -6245,194 +7665,195 @@ msgstr "con todos os cartafoles locais e cos remotos activos"
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar Puntuación"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Anexos"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contén"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copiar ó cartafol"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepción"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "non contén"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "non remata en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "non sona como"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "non empeza por"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "remata en"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "Importante"
 
-#: 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
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "A mensaxe foi recibida"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "A mensaxe foi enviada"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Mover ó cartafol"
 
-#: 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
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Coincide expresión regular (regexp)"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 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:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamaño"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "sona como"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Cabeceira específica"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "comeza por"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contén"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "non contén"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "non remata en"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "non sona como"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "non empeza por"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "remata en"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "é maior que"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "non é"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "é"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "en ou despois"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "en ou antes"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "sona como"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "comeza por"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi posterior a"
@@ -6462,14 +7883,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importar"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Correo Electrónico"
@@ -6501,12 +7921,12 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "¿Gústaríalle importalos a Evolution?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 #, fuzzy
 msgid "Settings"
 msgstr "Preferencias..."
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6565,170 +7985,191 @@ msgstr "Fábrica para a compoñente Resume de Correo."
 msgid "Mail configuration interface"
 msgstr "Configuración do Correo"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "CartafolV sobre a Lista de Correo"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propiedades..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades do ficheiro"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Enviar _Mensaxe"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Enviar _Mensaxe"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 #, fuzzy
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para \"%s\""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/folder-browser.c:893
-msgid "Store search as vFolder"
-msgstr "Almacenar búsqueda como CartafolV"
+#: mail/folder-browser.c:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "_Crear Filtro desde Mensaxe"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "CartafolV sobre o A_sunto"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "CartafolV sobre o Au_tor"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "CartafolV sobre os _Destinatarios"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV sobre _Lista de Correo"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Filtro sobre o As_unto"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Filtro sobre o Au_tor"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Filtro sobre os D_estinatarios"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Filtro sobre a Lista de _Correo"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "Re-enviar"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "_Gardar Mensaxe Como..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Importante"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Mover ó cartafol.."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Copiar ó cartafol..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Desde Mensaxe"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Filtro sobre a Lista de Correo"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV sobre a Lista de Correo (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Información Opcional"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6792,16 +8233,16 @@ msgid "Evolution News Editor"
 msgstr "Editor de Contas de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6812,40 +8253,45 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Desactivado"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Está seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Recuperar"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Facer esta a miña conta por defecto"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 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:742
-msgid "Evolution Account Manager"
-msgstr "Xestor de Contas de Evolution"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_Preferencias de Correo..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6900,11 +8346,11 @@ msgstr ""
 "Necesitas configurar transporte para o correo\n"
 "antes de poder compoñelo."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 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:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6912,7 +8358,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6920,37 +8366,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 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:410
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr "Ten que configurar unha identidade antes de poder enviar este correo."
 
-#: mail/mail-callbacks.c:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "O %s, %s escribiu:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, 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:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6958,7 +8403,7 @@ msgstr ""
 "Só pode editar mensaxes gardadas\n"
 "no cartafol de Borrador."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6966,25 +8411,42 @@ msgstr ""
 "Só pode reenviar mensaxes\n"
 "no cartafol de Enviados."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "¿Está seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "A mensaxe foi recibida"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Advertencia"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Non preguntar de novo"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6993,62 +8455,72 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtros..."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "Introduza nome e enderezo de correo electrónico máis abaixo. Os campos "
 "\"opcionais\" non necesitan encherse, a non ser que desexe incluír esta "
 "información nas mensaxes que mande."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Introduza información sobre o servidor de correo entrante. Se non sabe qué "
 "clase de servidor usa, contacte co administrador do sistema ou co Provedor "
 "de Servicios de Internet."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "Introduza información sobre o protocolo do servidor de correo saínte. Se non "
 "sabe o protocolo que usa, contacte co administrador do sistema ou co "
 "Provedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"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 entrante e método de transporte de correo saínte que introduciu "
@@ -7057,81 +8529,88 @@ msgstr ""
 "propósito de mostralo."
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr " Detectar tipos soportados "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Non está soportado asinar por este cifrado"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Información de Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Xestión e Contas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "Comprobar automaticamente se hai correo novo de cada"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Redactar"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7147,283 +8626,259 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Visualizar"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Cartafol Borradores:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
 #, fuzzy
-msgid "Edit..."
-msgstr "Editar..."
+msgid "E_nable"
+msgstr "Activado"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Enderezo de Correo-E:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nome Completo:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:43
-#, fuzzy
-msgid "Highlight citations with"
-msgstr "Resaltar citas con "
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Í_ndice"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Formato mailbox"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr "Facer esta a miña conta por defecto"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Marcar mensaxes como \"Lidas\" despois de: "
+msgid "Make this my _default account"
+msgstr "Facer esta a miña conta por defecto"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Servidor LDAP"
 
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organización:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "Camiño do binario PGP"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
-msgstr ""
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "No_tas:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Recibindo Opcións"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "Seleccionar un ficheiro"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Seleccionar o binario PGP"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "Enviar mensaxes en formato HTML por defecto."
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "O servidor require autenticación"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Sen Información"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "Usar conexión segura (SSL)"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7431,15 +8886,119 @@ msgstr ""
 "\n"
 "Preme en \"Seguinte\" para empezar. "
 
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "Comprobar automaticamente se hai correo novo de cada"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr " Detectar tipos soportados "
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "Enderezo de Correo-E:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "Resaltar citas con "
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "Marcar mensaxes como \"Lidas\" despois de: "
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "Nome:"
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organización:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "Camiño do binario PGP"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "Camiño:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Lembrar este contrasinal"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "Enviar mensaxes en formato HTML por defecto."
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "segundos."
 
@@ -7487,187 +9046,198 @@ msgstr "Non foi posible crear a fiestra do compositor"
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear a fiestra do compositor"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (vía %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Abrir ligazón no navegador"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Copiar localización (AMÁÑAME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gardar como (AMÁÑAME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gardar como..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Eliminada"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d segundos"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "Enderezo de Correo-E:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder-A:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non está configurado."
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Preme na icona para desencriptar."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 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:1388
+#: mail/mail-format.c:1403
 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:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, 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:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Parte externa do corpo mal formada."
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Non existe o cartafol %s"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Abrindo '%s'"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, 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:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7676,7 +9246,7 @@ msgstr ""
 "Non foi posible gardar metainformación do cartafol, seguramente\n"
 "non poderá abrir este cartafol nunca máis: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7684,12 +9254,12 @@ msgstr ""
 "Se non pode abrir máis esta caixa de correo, poida\n"
 "que teña que reparala a man."
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non podes copiar mensaxes deste cartafol de lixo."
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Configurar %s"
@@ -7712,105 +9282,130 @@ msgstr ""
 "Erro efectuando a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar este contrasinal"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Reconfigurando o cartafol"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "Recibindo Correo"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Lixo"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Sincronizando cartafol"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Reconfigurando o cartafol"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo as mensaxes"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando as mensaxes"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7819,7 +9414,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7828,11 +9423,11 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7841,87 +9436,83 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sen_título)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Múltiples Mensaxes"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Editar Mensaxe"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "Editar Mensaxe"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "Re-enviar"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 #, fuzzy
 msgid "Find:"
 msgstr "Buscar"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Camiño:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancelando ..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Recibindo"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "Agardando ..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Enviando"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7940,85 +9531,90 @@ msgstr "Mensaxe reenviada - %s"
 msgid "Forwarded message"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "Novo CArtafolV"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (sen asunto)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "Mensaxe"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:913
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "Gardando as mensaxes"
 
 #: mail/message-list.etspec.h:2
@@ -8034,38 +9630,77 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Cartafol"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Almacenar"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Mostar cartafoles que comezan por:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "Conseguindo almacenamento para \"%s\""
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscribíndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscribíndose do cartafol \"%s\""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Cartafol"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "A mensaxe foi recibida"
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Actualizar Lista"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Cartafoles"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Opcións de Vista"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Xestionar Subscripcións"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Subscribir"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Desubscribir"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Compoñente de Evolution para o resume Executivo"
@@ -8074,54 +9709,71 @@ msgstr "Compoñente de Evolution para o resume Executivo"
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fábrica para o compoñente de Resume Executivo de Evolution."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Non se pode inicializar o compoñente de Resume Executivo de Evolution."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "Amosar citas..."
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%I:%M %p"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "Resume de Correo"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. 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
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Nome:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Instalación de Evolution"
+msgid "Summary Settings"
+msgstr "O resume contén"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8133,7 +9785,12 @@ msgstr "Houbo un erro cargando o ficheiro da axenda."
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Erro cargando a axenda</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Novo Cartafol"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "Amosar tarefas"
@@ -8142,28 +9799,33 @@ msgstr "Amosar tarefas"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Seccións:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "_Resume"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "A impresión da mensaxe fallou"
 
 #: my-evolution/main.c:52
@@ -8171,6 +9833,42 @@ msgstr "A impresión da mensaxe fallou"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "°F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "°C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Movendo"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtros..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtros..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9363,129 +11061,145 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Respondida"
+msgid " _Remove"
+msgstr "Quitar"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Cartafoles"
+msgid "Add n_ew feed"
+msgstr "Respondida"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "Todas Atendidas"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Todas Atendidas"
+msgid "All _folders:"
+msgstr "Cartafoles"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Mostar cartafoles que comezan por:"
+msgid "All news _feeds:"
+msgstr "Respondida"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Opcións de Vista"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "Visualizar"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Venres"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr " unha semana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Amosar tarefas"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Amosar tarefas"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "Mércores"
+msgid "Tasks "
+msgstr "Tarefas"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "mes"
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "One week"
-msgstr " unha semana"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr ""
+msgid "Weather settings"
+msgstr "Limpar a selección"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"Programar\n"
-"Hora"
+msgid "_Display folders:"
+msgstr "Mostar cartafoles que comezan por:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Amosar tarefas"
+msgid "_Display stations:"
+msgstr "Opcións de Vista"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "con todos os cartafoles remotos activos"
+msgid "_Displayed feeds:"
+msgstr "Visualizar"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Amosar tarefas"
+msgid "_Five days"
+msgstr "Venres"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Tarefas"
+msgid "_Mail"
+msgstr "Correo Electrónico"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  Unidade:  "
+msgid "_News Feeds"
+msgstr "_Novo Cartafol"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Outro"
+msgid "_One day"
+msgstr "Mércores"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "Limpar a selección"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "abril"
+msgid "_Schedule"
+msgstr ""
+"Programar\n"
+"Hora"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9502,7 +11216,17 @@ msgstr "Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Reunión"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Cartafoles especiais"
@@ -9555,7 +11279,7 @@ msgid ""
 "`%s'."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9566,7 +11290,7 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9575,7 +11299,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9586,57 +11310,80 @@ msgstr ""
 "directorio de Evolution. Móvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copiar ó cartafol"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Mover ó cartafol"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Borrar despois de %s día(s)"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Abrindo cartafol %s"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#. 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-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9650,7 +11397,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "O nome de cartafol indicado non é válido."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
@@ -9662,11 +11409,11 @@ msgstr ""
 "O tipo do cartafol seleccionado non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
@@ -9706,7 +11453,7 @@ msgstr ""
 "Importando %s\n"
 "Importando obxecto %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9755,7 +11502,7 @@ msgstr "Automático"
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
@@ -9763,32 +11510,54 @@ msgstr "Seleccionar un ficheiro"
 msgid "File type:"
 msgstr "Tipo do ficheiro:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Non se pode inicializar o compoñente de correo de Evolution."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9798,88 +11567,104 @@ msgstr ""
 "en grupo para xestión de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "Ir ó cartafol..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Traballar desconectado"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "Traballar desconectado"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(Ningún cartafol visualizado)"
 
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1411
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
 "Isto significa probablemente que o compoñente %s se estragou."
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "Aceptar"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "Contidos da mensaxe non válidos"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "Non se pode rexistrar o almacenamento coa shell"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "Erro xenérico"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9888,182 +11673,168 @@ msgstr ""
 "¿Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Abrir"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:479
-#, fuzzy
-msgid "Rename"
-msgstr "Nome da regra: "
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Barra de _Atallos"
 
-#: shell/e-shortcuts.c:984
-#, fuzzy
-msgid "Inbox"
-msgstr "mbox"
-
-#: shell/e-shortcuts.c:987
-#, fuzzy
-msgid "Contacts"
-msgstr "_Contacto"
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Erro xenérico"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non é válido"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "Función non implementada neste almacenamento"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "Operación non soportada"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non está soportado neste almacenamento"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Non se atopou o cartafol indicado"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Comp_leta:"
 
@@ -10085,10 +11856,6 @@ msgstr "Servidor:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: 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:"
@@ -10102,17 +11869,29 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Preme en \"Importar\" para comezar a importar o ficheiro a Evolution. "
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Utilidade de Importación de Evolution"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Utilidade Importadora de Evolution"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Seleccionar un ficheiro"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "Benvido á Utilidade de Importación de Evolution.\n"
@@ -10134,10 +11913,11 @@ msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "Compoñente de evolution para manexar o correo."
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10170,7 +11950,7 @@ msgstr ""
 "Agardamos que desfrutes os resultados do noso duro traballo, ¡e\n"
 " estamos impacientes esperando a túa contribución!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10178,25 +11958,30 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Non se pode inicializar a shell de Evolution."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:216
+#: shell/main.c:229
 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:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Copiar"
 
@@ -10213,11 +11998,11 @@ msgstr "Crear un novo contacto"
 msgid "Create new contact list"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
@@ -10226,78 +12011,121 @@ msgstr "Cortar a selección"
 msgid "Delete selected contacts"
 msgstr "Borrar un contacto"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Novo contacto"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Novas"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Borrar un contacto"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Enviar unha _mensaxe ao contacto..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Enviar mensaxe a un contacto"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "Enviar contacto a outro"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "_Accións"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Contactos..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-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:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "Gardar como TarxetaV"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: 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"
 
@@ -10307,112 +12135,131 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Crear un novo Evento de todo o día"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Crear unha nova cita"
+msgid "Create a New _Task"
+msgstr "Crear unha nova tarefa"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear unha nova cita"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Día"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "Ir para atrás no tempo"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Ir á _Data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Ir á hora actual"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Ir a Hoxe"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Mes"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nova Cita"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Nova Tarefa"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Imprimir Axenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "Imprimir esta Axenda"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Previsualizar a Impresión"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Información Requerida"
+msgid "Print this calendar"
+msgstr "Imprimir esta Axenda"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Amosar un día"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Semana Lab_oral"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "_Citas"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "_Día"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "_Mes"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Información Requerida"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "_Semana"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Tarefa"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10423,15 +12270,16 @@ msgid "Close"
 msgstr "Pechar"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#, fuzzy
+msgid "Close this item"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Barra de Ferramentas Principal"
 
@@ -10440,118 +12288,86 @@ msgstr "Barra de Ferramentas Principal"
 msgid "Preview the printed item"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "Previsualizar a Impresión"
-
-#: ui/evolution-comp-editor.xml.h:11
-#, fuzzy
-msgid "Print S_etup"
-msgstr "Configuración da Impresión"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: 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
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de diálogo"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Gardar a tarefa e pechar a caixa de diálogo"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, fuzzy
 msgid "Save this item to disk"
 msgstr "Trocar a vista de %s"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar as opcións de páxina para a impresora actual"
-
-#: ui/evolution-comp-editor.xml.h:19
-#, fuzzy
-msgid "_Action"
-msgstr "_Accións"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-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:47
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Borrar este elemento"
-
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete..."
-msgstr "Eliminar..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Axuda"
-
 #: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "_Configuración da Impresión..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de diálogo"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "E_nviar contacto a outro..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "Ver a axuda online"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Enviar unha _mensaxe ao contacto..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: 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
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Borrar este elemento"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Eliminar..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Gardar a tarefa e pechar a caixa de diálogo"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "E_nviar contacto a outro..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Enviar unha _mensaxe ao contacto..."
@@ -10561,22 +12377,22 @@ msgstr "Enviar unha _mensaxe ao contacto..."
 msgid "Cancel Mee_ting"
 msgstr "Cancelar Reunión"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Re-enviar como _AxendaV (AMÁÑAME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Re-enviar esta mensaxe"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10591,16 +12407,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "_Programar Reunión"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "AMÁÑAME: Programar Reunión"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
-msgid "_Actions"
-msgstr "_Accións"
-
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
@@ -10617,68 +12428,65 @@ msgid "Cancel the current mail operation"
 msgstr "Gardar o ficheiro actual"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Redactar"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Baleirar _Lixo"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _Subcripcións"
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de Cartafoles Virtuais..."
 
@@ -10703,97 +12511,108 @@ msgstr "Previsualizar"
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "Subscribíndose ao cartafol \"%s\""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Cortar"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Agochar Mensaxes S_eleccionadas"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Agochar Mensaxes _Borradas"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Marcar Todas como L_idas"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Seleccionar _Fío"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Lista de mensaxes por fíos"
 
@@ -10802,7 +12621,7 @@ msgstr "Lista de mensaxes por fíos"
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Cartafol"
 
@@ -10810,11 +12629,11 @@ msgstr "_Cartafol"
 msgid "_Invert Selection"
 msgstr "_Inverter Selección"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Lista de mensaxes por fíos"
@@ -11062,7 +12881,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -11084,43 +12904,37 @@ msgstr "Imprimir Mensaxe"
 msgid "Previous Unread Message"
 msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Imprimir mensaxe..."
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "Previsualización da Impresión"
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Mensaxe de servidor:"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe nun novo ficheiro"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opcións de páxina para a impresora actual"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -11169,74 +12983,57 @@ msgstr "CartafolV sobre os _Destinatarios"
 msgid "VFolder on _Subject..."
 msgstr "CartafolV sobre o A_sunto"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copiar ó cartafol"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro desde Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mover ó cartafol"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Visualizar"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "_Re-enviar Mensaxes"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar Barras de Tarefas..."
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Personalizar"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "Personalizar barras de tarefas"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vista"
 
@@ -11303,11 +13100,6 @@ msgstr "Encriptar con PGP"
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Gardar"
-
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Gardar Como"
@@ -11438,7 +13230,7 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -11472,15 +13264,28 @@ msgstr "Desubscribir"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Asig_nar Tarefa (AMÁÑAME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Nova Tarefa"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Borrar a tarefa"
+msgid "Cancel this task"
+msgstr "Nova Tarefa"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "Actualizar Lista"
@@ -11489,44 +13294,32 @@ msgstr "Actualizar Lista"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Abrir Obxectos Seleccionados"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Crear unha nova tarefa"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Borrar a tarefa"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Borrar a tarefa"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Nova Tarefa"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Gardar como outra cousa distinta"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Tarefa"
 
@@ -11564,186 +13357,167 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Create a new folder"
 msgstr "Creando un novo cartafol"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Borrar este elemento"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Visualizar un cartafol diferente"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Saír"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Fiestra do Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "_Iniciación"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "Importar un formato de ficheiro externo"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Amosar información sobre o Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Toggle"
 msgstr "Posto"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mosta da barra de cartafoles"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mosta da barra de atallos"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Trocar mostra do selector de Deste"
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "Uso do Xestor de Co_ntactos"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "Uso da _Axenda"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "Uso do Cliente de _Correo"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AMÁÑAME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AMÁÑAME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "_Copiar"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "_Importar ficheiro..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "Í_ndice"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Mensaxe de correo"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "Mover"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AMÁÑAME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Traballar desconectado"
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Cambiar as propiedades deste cartafol"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
-msgstr "_Preferencias de Correo..."
+msgid "Print summary"
+msgstr "Resume de Correo"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Ler"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "Preferencias do Resume Executivo..."
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
@@ -11778,6 +13552,30 @@ msgstr "Mensaxes"
 msgid "With Category"
 msgstr "Coa Categoría"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Seleccionar un ficheiro"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Seccións:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zona horaria: "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. 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
@@ -11785,10 +13583,6 @@ msgstr "Coa Categoría"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupado"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
@@ -11861,7 +13655,7 @@ msgstr "Todas Atendidas"
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -11871,19 +13665,20 @@ msgstr "Definir Vistas"
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B de %Y"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Hoxe"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Aceptar"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -11970,35 +13765,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Editor de contactos"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Gardar Búsqueda"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Búsqueda Avanzada"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Gardar Búsqueda"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "_Limpar"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avanzado..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Información"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advertencia"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Erro"
@@ -12016,10 +13809,15 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Bus_car"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "Asignar ND:"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "O Servidor Persoal do Libro de Enderezos"
@@ -12040,6 +13838,307 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
+
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor LDAP"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo de libro de enderezos descoñecido"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Ningún (modo anónimo)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo de autenticación descoñecido"
+
+#~ msgid "Subtree"
+#~ msgstr "Subárbore"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo de ámbito descoñecido"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Asignar ND aquí"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "AMÁÑAME Texto de axuda para Servidor aquí"
+
+#~ msgid "Root DN:"
+#~ msgstr "ND Raíz:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "AMÁÑAME Texto de axuda para ND Raíz aquí"
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "AMÁÑAME Texto de axuda para Porto aquí"
+
+#~ msgid "Authentication:"
+#~ msgstr "Autenticación:"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Camiño aquí"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Crear camiño se non existe."
+
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "Elixe a clase de Libro de Enderezos que tes, e introduce a información "
+#~ "relevante sobre el."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Nome aquí"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "AMÁÑAME Texto de axuda para Descrición aquí"
+
+#~ msgid "Name"
+#~ msgstr "Nome:"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Introduza o contrasinal %s"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Nome contén"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Seleccionar nome desde:"
+
+#~ msgid "USA"
+#~ msgstr "Estados Unidos"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Cancelada"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparente"
+
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "A clasificación ten que ser 'Pública', 'Privada', 'Confidencial' ou "
+#~ "'Ningunha'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Chifrar cando aparece a fiestra de alarma."
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias da Axenda"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "Opcións do navegador de Citas"
+
+#~ msgid "Defaults"
+#~ msgstr "Opcións por defecto"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Lembrarme todas as citas"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutos antes de que ocorran."
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Eliminada"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Nada"
+
+#~ msgid "Task"
+#~ msgstr "Tarefa"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leta:"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparencia"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Esta mensaxe non está dispoñible actualmente."
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "O cartafol parece estar corrompido sen recuperación posible."
+
+#~ msgid "All"
+#~ msgstr "Todas"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Almacenar búsqueda como CartafolV"
+
+#~ msgid "Resend"
+#~ msgstr "Re-enviar"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Xestor de Contas de Evolution"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "O %s, %s escribiu:"
+
+#~ msgid "Receiving"
+#~ msgstr "Recibindo"
+
+#~ msgid "Store"
+#~ msgstr "Almacenar"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Mostar cartafoles que comezan por:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Conseguindo almacenamento para \"%s\""
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Instalación de Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d de %B de %Y"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "A impresión da mensaxe fallou"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "Novo contacto"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "_Contacto"
+
+#~ msgid "Go to present time"
+#~ msgstr "Ir á hora actual"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Semana Lab_oral"
+
+#~ msgid "_Day"
+#~ msgstr "_Día"
+
+#~ msgid "_Week"
+#~ msgstr "_Semana"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Pechar esta cita"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "_Accións"
+
+#~ msgid "Help"
+#~ msgstr "Axuda"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "E_nviar contacto a outro..."
+
+#~ msgid "See online help"
+#~ msgstr "Ver a axuda online"
+
+#~ msgid "Compose"
+#~ msgstr "Redactar"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Xestionar _Subcripcións"
+
+#~ msgid "Show _All"
+#~ msgstr "Amosar _Todo"
+
+#, fuzzy
+#~ msgid "Print Message..."
+#~ msgstr "Imprimir mensaxe..."
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "Previsualización da Impresión"
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "_Re-enviar Mensaxes"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zar Barras de Tarefas..."
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personalizar barras de tarefas"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Borrar a tarefa"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Gardar como outra cousa distinta"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_Iniciación"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso do Xestor de Co_ntactos"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso da _Axenda"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso do Cliente de _Correo"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (AMÁÑAME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto (AMÁÑAME)"
+
+#~ msgid "_Index"
+#~ msgstr "Í_ndice"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Mensaxe de correo"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tarefa (AMÁÑAME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "_Preferencias de Correo..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "Preferencias alternativas"
@@ -12100,9 +14199,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Alarms timeout after"
 #~ msgstr "As alarmas saltan despois de"
 
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
 #, fuzzy
 #~ msgid "Enable snoozing for"
 #~ msgstr "Activar adiando para"
@@ -12126,10 +14222,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Overdue Items:"
 #~ msgstr "Retrasar Cousas:"
 
-#, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "Rota de Tarefas"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tempo ata que se deba facer"
 
@@ -12154,9 +14246,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Edit the task"
 #~ msgstr "Editar Tarefa"
 
-#~ msgid "Go to Today"
-#~ msgstr "Ir a Hoxe"
-
 #~ msgid "Component successfully updated."
 #~ msgstr "Compoñente actualizada con éxito."
 
@@ -12224,12 +14313,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Starting date:"
 #~ msgstr "Data de _comezo:"
 
-#~ msgid "Summary contains"
-#~ msgstr "O resume contén"
-
-#~ msgid "Comment contains"
-#~ msgstr "O comentario contén"
-
 #~ msgid "Has category"
 #~ msgstr "Ten a categoría"
 
@@ -12351,9 +14434,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Fábrica para o resume RDF."
 
-#~ msgid "RDF Summary"
-#~ msgstr "Resume RDF"
-
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Fábrica para o compoñente bonobo de probas."
 
@@ -12402,15 +14482,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (mensaxe reenviada)"
 
-#~ msgid "Fwd: (no subject)"
-#~ msgstr "Fwd: (sen asunto)"
-
 #~ msgid "Forwarded message (no subject)"
 #~ msgstr "Mensaxe reenviada (sen asunto)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-#~ "%s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
 #~ "-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
 #~ "%s<br><b>Asunto:</b> %s <br>"
@@ -12445,9 +14522,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Crear unha nova axenda"
 
-#~ msgid "Day"
-#~ msgstr "Día"
-
 #~ msgid "New _Event"
 #~ msgstr "Novo _Evento"
 
@@ -12460,9 +14534,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Save calendar as something else"
 #~ msgstr "Gardar axenda como outra cousa distinta"
 
-#~ msgid "Week"
-#~ msgstr "Semana"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "_Abrir axenda"
 
@@ -12478,9 +14549,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "_Libro de enderezos... (AMÁÑAME)"
 
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Comproba_r Nomes (AMÁÑAME)"
 
@@ -12523,9 +14591,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Select everything"
 #~ msgstr "Seleccionar todo"
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "_Petición de Tarefa (AMÁÑAME)"
-
 #~ msgid "_About..."
 #~ msgstr "_Acerca de..."
 
@@ -12559,12 +14624,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Create a new email"
 #~ msgstr "Crear unha nova mensaxe de correo"
 
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "Preferencias do Resume Executivo..."
-
-#~ msgid "New Mail"
-#~ msgstr "Nova Mensaxe"
-
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
 
@@ -12590,9 +14649,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Reenviar esta mensaxe in-line coa túa, así podes editala"
 
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Agochar Mensaxes Borradas"
-
 #~ msgid "Invert Selection"
 #~ msgstr "Inverter Selección"
 
@@ -12641,9 +14697,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Reply"
 #~ msgstr "_Responder"
 
-#~ msgid "_Save Message As..."
-#~ msgstr "_Gardar Mensaxe Como..."
-
 #~ msgid "_Threaded"
 #~ msgstr "_Por fíos"
 
@@ -12656,12 +14709,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Inserir ficheiro de texto... (AMÁÑAME)"
 
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "Asig_nar Tarefa (AMÁÑAME)"
-
-#~ msgid "Meeting Re_quest (FIXME)"
-#~ msgstr "_Solicitude de Reunión (AMÁÑAME)"
-
 #~ msgid "Redo"
 #~ msgstr "Refacer"