update version reliance

2003-12-07  JP Rosevear  <jpr@ximian.com>

	* configure.in: update version reliance

svn path=/trunk/; revision=23667

1 files changed, 3564 insertions, 2340 deletions

diff --git a/po/gl.po b/po/gl.po
index f3cc1ec7b9..4fa1b9739c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -37,7 +37,165 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Data na que se completa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID do certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propiedades..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "Renomear"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo Contacto:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crear un novo contacto"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nova Lista de Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crear unha nova lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Traballando"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Servidor NNTP:"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -45,7 +203,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -53,49 +211,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nome da Conta"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nome do Servidor"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL non está soportado nesta versión de evolution)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Outros Contactos"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -103,7 +244,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -114,7 +255,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -126,7 +267,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -141,11 +282,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -153,38 +294,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -192,7 +332,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -200,95 +340,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID do certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editar o Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -312,6 +398,7 @@ msgstr "Dete_ctar tipos soportados "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -347,8 +434,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "Servidor NNTP:"
+msgid "Addressbook Creation Assistant"
+msgstr "Fontes do Libro de Enderezos"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -367,60 +454,59 @@ msgstr "Anónimo"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "B_uscar"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Configuración do Correo"
+msgid "Group:"
+msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -445,8 +531,8 @@ msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
@@ -492,27 +578,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Información da Fonte"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Conectando ao servidor..."
+msgid "Step 2: Server Information"
+msgstr "Información da Fonte"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Conectando ao servidor..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Conectando ao servidor..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -525,14 +612,6 @@ msgstr "Armacenar busca como CartafolV"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -540,7 +619,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -548,7 +627,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -558,37 +637,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -598,6 +676,15 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Este nome hase empregar para identifica-la conta. Só se empregará para "
+"amosar."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -624,22 +711,30 @@ msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -647,61 +742,60 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nome:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Eliminar Todos"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eliminar"
@@ -730,25 +824,21 @@ msgstr "Engadir a Contactos"
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nome:"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Fonte"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Buscar un contacto"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -832,7 +922,8 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
@@ -904,12 +995,12 @@ msgid "_Categories..."
 msgstr "Ca_tegorías..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Borrar"
@@ -2058,7 +2149,7 @@ msgid "Esq."
 msgstr "Don"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nome Completo:"
 
@@ -2156,11 +2247,27 @@ msgstr "Editor de Listas de Contactos"
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contacto Cambiado:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contacto Conflictivo:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un Contacto Duplicado"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"O enderezo ou nome cambiado deste contacto xa existe neste\n"
+"cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Novo Contacto:"
@@ -2177,22 +2284,6 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contacto Cambiado:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contacto Conflictivo:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"O enderezo ou nome cambiado deste contacto xa existe neste\n"
-"cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2301,9 +2392,9 @@ msgstr "Remitir Contacto"
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -2327,9 +2418,12 @@ msgstr "_Mover ó Cartafol.."
 msgid "Cut"
 msgstr "Cortar"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2338,16 +2432,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Eliminar"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -2361,166 +2447,171 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Prema aquí para engadir un contacto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Teléfono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Enderezo do Traballo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Teléfono do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Teléfono do Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Teléfono de Resposta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Teléfono do Automóbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Correo Electrónico 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome Completo:"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arquivar coma"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL libre-ocupado"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Enderezo Particular"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nome Completo:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Teléfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "RDSI"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Nada"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Xordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcume"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Outro Enderezo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Outro Teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Buscapersoas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesión"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Cónxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Non vista"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Sitio Web"
 
@@ -2625,11 +2716,19 @@ msgstr "Membros"
 msgid "Job Title"
 msgstr "_Posto de traballo:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Enderezo Particular"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Enderezo Particular"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Outro Enderezo"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2642,123 +2741,120 @@ msgstr "Fax Particular"
 msgid "Blog"
 msgstr "para sempre"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Éxito"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "A autenticación fallou."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "¿Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimir tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2767,51 +2863,51 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 #, fuzzy
 msgid "list"
 msgstr "Brétema"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -3008,7 +3104,7 @@ msgstr "Marxes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcións"
 
@@ -3200,18 +3296,18 @@ msgstr "Contacto Sen Nome"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 
@@ -3220,27 +3316,94 @@ msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 msgid "Default Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de Novas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Editor de Novas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Compoñente do resumo executivo da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Compositor de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Fábica para o servicio de notificación de alarmas"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Opcións"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Í_ndice"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas"
@@ -3306,45 +3469,174 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Fábica para o servicio de notificación de alarmas"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacións de alarma"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalización:"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Axenda"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Cor para tarefas para hoxe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Cor para tarefas para hoxe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Amosar os prazos _finais das citas nas vistas semanal e mensual"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Previsualiza a axenda que se vai imprimir"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "_Crear novas citas cun recordatorio por defecto"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Pedir confirmación ao eliminar elementos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Pedir confirmación ao eliminar elementos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Borrar a tarefa seleccionada"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Amosa-los _números das semanas no navegador de datas"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3356,81 +3648,115 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "é menor que"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 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:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Imprimir esta axenda"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "Renomear"
+#: calendar/gui/calendar-component.c:632
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cita"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Work"
-msgstr "Traballando"
+msgid "New meeting"
+msgstr "Configuración da Fonte de Novas"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Xuntanza"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Nova C_ita"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3553,7 +3879,7 @@ msgstr "Enviar como:"
 msgid "With these arguments:"
 msgstr "Con estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "dialog1"
 msgstr "Amosar un diálogo"
@@ -3570,6 +3896,10 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3603,8 +3933,8 @@ msgstr "Enviar unha mensaxe"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3633,7 +3963,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -3688,7 +4018,7 @@ msgstr "Días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Venres"
 
@@ -3702,7 +4032,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Luns"
 
@@ -3713,7 +4043,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -3727,7 +4057,7 @@ msgstr "Amosa-los _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3747,7 +4077,7 @@ msgstr "Lista de _Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -3765,7 +4095,7 @@ msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -3775,12 +4105,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Mércores"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Semana Laboral"
 
@@ -3818,7 +4148,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Xeral"
 
@@ -3863,76 +4193,76 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "¿Está seguro de que quere cancelar e borrar esta cita?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "¿Está seguro de que quere cancelar e borrar esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "¿Está seguro de que quere cancelar e borrar esta entrada de diario?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento foi eliminado."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi eliminada."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diario foi eliminada"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non fixo cambios, ¿quere pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarefa foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diario foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
@@ -3942,166 +4272,171 @@ msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Pendente "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Escolla un cartafol de destino para importar estes datos"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "¿Está seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "¿Está seguro de que quere borrar esta tarefa sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "¿Está seguro de que quere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "¿Está seguro de que quere borrar %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Está seguro de que quere borrar %d entradas de diario?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
@@ -4118,46 +4453,46 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4230,32 +4565,32 @@ msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -4296,21 +4631,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4330,6 +4659,7 @@ msgid "_Invite Others..."
 msgstr "_Convidar Outros..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4362,6 +4692,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Non foi posible crear o directorio %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Debe estabrecerse un organizador."
@@ -4391,34 +4722,59 @@ msgstr "información de axenda"
 msgid "Calendar Name"
 msgstr "Axenda"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "información de axenda"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Illas Wallis e Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Illas Wallis e Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Avanzado"
@@ -4472,10 +4828,15 @@ msgstr "día"
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "ocorrencias"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Hora:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Enga_dir"
@@ -4540,7 +4901,7 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4551,34 +4912,34 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Completada "
@@ -4589,43 +4950,43 @@ msgid "% _Complete"
 msgstr "% Completo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -4634,7 +4995,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -4656,21 +5017,21 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Enderezo da páxina _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4678,9 +5039,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -4786,26 +5147,21 @@ msgstr "Servidor %s %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorías"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4818,29 +5174,27 @@ msgid "Start Date"
 msgstr "Data de _Inicio:"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Cita"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -4852,7 +5206,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4860,7 +5214,7 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4870,7 +5224,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4878,7 +5232,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4886,17 +5240,17 @@ msgstr "Non"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -4908,190 +5262,188 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Preferencias de Correo..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -5105,8 +5457,8 @@ msgstr "% Completo"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Completo"
 
@@ -5135,18 +5487,18 @@ msgid "URL"
 msgstr "URL:"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5165,7 +5517,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
@@ -5178,137 +5530,137 @@ msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recorrencia _simple"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d días"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d semanas"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Area"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Un m_es"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrición:</b> %s"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "información de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente descoñecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5316,11 +5668,11 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr ""
@@ -5328,326 +5680,325 @@ msgstr ""
 "Localización Xeográfica: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acción"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou información sobre unha reunión."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desexa asistir a unha reunión existente."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a reunión."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respostou a unha petición de xuntanza."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou información sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a tarefa."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respostou a unha asignación de tarefa."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou información de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a súa información libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respostou a unha petición de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -5810,7 +6161,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5874,100 +6225,86 @@ msgstr "Hora do _inicio da reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Data Límite"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioridade:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Páxina"
 
-#: calendar/gui/e-tasks.c:715
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "Abrindo armacenamento %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmas"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5975,7 +6312,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5983,65 +6320,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Compoñente do resumo executivo da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Compositor de correo de Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -6098,308 +6381,345 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Información Opcional"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 #, fuzzy
 msgid "Calendar information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Actualizar Lista"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "E_stado:"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioridade:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Categorías: "
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 #, fuzzy
 msgid "Contacts: "
 msgstr "Co_ntactos:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Renomear este atallo"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Nova Tarefa"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6412,11 +6732,11 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarxetas"
@@ -6449,17 +6769,17 @@ msgstr "Mensaxe da Axenda"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6468,7 +6788,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
@@ -8107,28 +8427,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "As sinaturas non están soportadas por este cifrado"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "A verificación non está soportada neste cifrado"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Non se soporta o cifrado con esta cifra"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Non está soportado o descifrado desta cifra"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Non está soportado o descifrado desta cifra"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Non está soportado o descifrado desta cifra"
@@ -8184,89 +8504,89 @@ msgstr "Creando o cartafol %s"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operación"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos non válidos"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos non válidos"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
@@ -8298,41 +8618,41 @@ msgstr "(coinciden-todas) require un único resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiando as mensaxes"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8340,47 +8660,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Non se especificou un nome de cartafol"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8388,49 +8708,61 @@ msgid ""
 "%s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Non foi posible crear o ficheiro temporal: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Mensaxe cifrada"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Non foi posible recibir a mensaxe do editor"
@@ -8531,15 +8863,15 @@ msgstr "Erro ao escribir o ficheiro temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar o ficheiro temporal de correo: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Outro erro"
@@ -8858,12 +9190,12 @@ msgstr "Fornecedor de correo do cartafol virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo coma unha petición de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, 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:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8872,73 +9204,84 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Indefinida"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Engadir criterio"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Engadir criterio"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "ID do certificado:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Gravar sinatura"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Outro erro"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tipo de Servidor: "
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Lixo"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "xuño"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -9144,7 +9487,7 @@ msgid ""
 "Issuer: %s"
 msgstr "ID do certificado:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
@@ -9164,26 +9507,26 @@ msgstr "Non existe a mensaxe %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -9261,7 +9604,7 @@ msgstr "Non se puido descodifica-la mensaxe."
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9275,7 +9618,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Non existe a mensaxe"
@@ -9313,54 +9656,72 @@ msgid "Failed to cache %s: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Conectando ao servidor..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "_Compañía:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Cartafoles"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Amosar só os cartafoles subscritos"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Espacio de nomes"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Contrasinal"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9618,7 +9979,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -9737,30 +10098,30 @@ msgstr "Buscando mensaxes novas"
 msgid "Storing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Operación cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, 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:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9769,11 +10130,11 @@ msgstr ""
 "Non é posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 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:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
@@ -9841,12 +10202,17 @@ msgstr "Non foi posible crear o directorio %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "O ID da Tarxeta xa existe"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de cartafol indicado non é válido: %s"
@@ -9895,7 +10261,7 @@ msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -10181,7 +10547,7 @@ msgstr "Borrar despois de %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10272,7 +10638,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10328,7 +10694,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:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10506,7 +10872,7 @@ msgstr "Entrega de correo SMTP vía %s"
 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:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -10634,7 +11000,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "anexo"
 
@@ -10679,14 +11045,14 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
@@ -10697,45 +11063,45 @@ msgstr "Prema aquí para o libro de enderezos"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 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:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10746,16 +11112,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Porto:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "descrición"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Anexar un ficheiro á mensaxe"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10792,21 +11163,21 @@ msgstr "O ficheiro existe, ¿sobrescribir?"
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10815,7 +11186,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10824,7 +11195,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10833,7 +11204,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10842,7 +11213,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10851,7 +11222,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesión anterior.\n"
 "¿Gostaríalle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10862,36 +11233,36 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10902,7 +11273,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10911,19 +11282,20 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "A suite de traballo en grupo Evolution"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -11181,13 +11553,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 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:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11318,7 +11690,7 @@ msgstr "Entón"
 msgid "You must specify a folder."
 msgstr "Nome do estilo:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
@@ -11332,26 +11704,26 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "despois"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Proba"
 
@@ -11457,7 +11829,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -11557,7 +11929,7 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -11630,121 +12002,127 @@ msgid "Source Account"
 msgstr "Conta Fonte"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Orballo"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabeceira específica"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "contén"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "non contén"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "non remata en"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "non soa como"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "remata en"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "foi anterior a"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "non é"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "é"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Ocupado"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "comeza por"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11770,21 +12148,91 @@ msgstr "Nome da regra: "
 msgid "Score Rules"
 msgstr "Regras de Puntuación"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Contas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferencias da Axenda"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Está seguro de que quere borrar esta conta?"
@@ -11829,7 +12277,7 @@ msgid "Protocol"
 msgstr "Porto Rico"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
@@ -11859,19 +12307,15 @@ msgstr "Engadir criterio"
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-#, fuzzy
-msgid "Send anyway?"
-msgstr "Enviar unha mensaxe"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11879,7 +12323,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11887,11 +12331,11 @@ msgstr ""
 "Xa que a lista de contactos á que envía está configurada para agocha-los "
 "enderezos da lista, esta mensaxe só ha conter destinatarios Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11901,11 +12345,11 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "¿Enviar de todas maneiras?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11918,198 +12362,417 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Abrir en %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Crear un _Novo Cartafol..."
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Especifica ónde crear o cartafol:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Non foi posible pechar o cartafol temporal: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#, fuzzy
+msgid "Loading..."
+msgstr "Agardando..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Crear un novo cartafol"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Non foi posible borrar o cartafol `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Elimina-lo cartafol '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Eliminar"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomea-lo cartafol '%s'"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Renomea-lo cartafol '%s'"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propiedades"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nome do cartafol:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Vista"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Novo Cartafol"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propiedades..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marcar como _Non Lida"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marcar coma _Importante"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar polo Au_tor"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Aparicións:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignada"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Engadir criterio"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Engadir criterio"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Indefinida"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Mensaxe cifrada"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Cifrar con PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Mensaxe cifrada"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "O usuario cancelou a operación."
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Non se puido verifica-los certificados."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Inline"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Agochar"
@@ -12119,98 +12782,73 @@ msgstr "Agochar"
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) válido no sitio \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Ficheiro de sinatura HTML:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Non foi posible inicializar GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "O usuario cancelou a operación."
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -12218,92 +12856,139 @@ msgstr ""
 "Cliente de Correo: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+msgid "Session not initialised"
+msgstr "Non foi posible inicializar GNOME"
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Agardando..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Examinando %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscribir"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12312,27 +12997,27 @@ msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12341,7 +13026,7 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12350,26 +13035,39 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Enderezo:"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Esta operación ha eliminar permanentemente todas as mensaxes marcadas como "
+"eliminadas. Se continúa, non será capaz de recuperar estas mensaxes.\n"
+"\n"
+"¿Eliminar realmente estas mensaxes?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12378,106 +13076,387 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferencias da Axenda"
+msgid "Automatic link recognition"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
+msgid "Default charset in which to compose messages"
+msgstr "Borrar esta mensaxe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Borrar esta mensaxe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
+msgid "Default charset in which to display messages"
+msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Compositor de correo de Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Compositor de correo de Evolution."
+msgid "Default forward style"
+msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
+msgid "Default reply style"
+msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+msgid "Empty Trash folders on exit"
+msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Enviar a mensaxe máis tarde"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferencias da Axenda"
+msgid "Log filter actions"
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution está importando o seu correo de Elm antigo"
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Importando..."
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Agarde, por favor"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importando %s coma %s"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Examinando %s"
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Configuración do Correo"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Configuración do Correo"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution atopou ficheiros de correo de Elm.\n"
-"¿Gostaríalle importalos a Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Enviar as mensaxes en formato HTML por defecto."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Enviar as mensaxes en formato HTML por defecto."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Amosa-lo Tempo Coma"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Amosa-lo Tempo Coma"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Amosa-la mensaxe no estilo normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Panel de Previsualización"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Contacto Orixinal:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Lista de Mensaxes por Fíos"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Lista de Mensaxes por Fíos"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Mensaxe remitida (sen asunto)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Facer esta a miña conta por _defecto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Variable"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12512,6 +13491,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Compositor de correo de Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution está importando o seu correo de Elm antigo"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Importando..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Agarde, por favor"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importando %s coma %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Examinando %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Elm.\n"
+"¿Gostaríalle importalos a Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12553,12 +13570,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Lixo"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12568,7 +13579,7 @@ msgstr "Ficheiro local de correo %s"
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Comezando a importación"
 
@@ -12648,24 +13659,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome"
 
@@ -12674,35 +13685,35 @@ msgstr "Non pode crear dúas contas co mesmo nome"
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Respondido a"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12710,146 +13721,31 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Conectando ao servidor..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Este cartafol non pode conter mensaxes."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Non foi posible pechar o cartafol temporal: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Escolla un cartafol de destino para importar estes datos"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Escolla un cartafol de destino para importar estes datos"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Crear un novo cartafol"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Especifica ónde crear o cartafol:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Non foi posible borrar o cartafol `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Elimina-lo cartafol '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Eliminar"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renomea-lo cartafol '%s'"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Renomea-lo cartafol '%s'"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "O nome de cartafol indicado non é válido: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propiedades"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nome do cartafol:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Vista"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Abrir nunha Nova Fiestra"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Novo Cartafol"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renomear"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propiedades..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identidade"
 
@@ -12919,11 +13815,11 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -13014,30 +13910,39 @@ msgid "C_olors"
 msgstr "P_echar"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Comprobando o novo correo"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -13054,333 +13959,342 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificación de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo contén"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar accións"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Opcións"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gardar e Pechar"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Localización da caixa do correo"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "A mensaxe contén"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opcións de Recepción"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Información Requirida"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticación"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13391,196 +14305,205 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "xuño"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor está no libro de enderezos"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Eliminar..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "San Marino"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Contacto Orixinal:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexión segura (_SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13589,7 +14512,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13598,7 +14521,7 @@ msgstr ""
 "Erro ao efectuar a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Traballando"
 
@@ -13610,118 +14533,118 @@ msgstr "Filtrando o Cartafol"
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13730,7 +14653,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13739,11 +14662,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13752,21 +14675,25 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Distinguir Maiúsculas"
@@ -13783,62 +14710,77 @@ msgstr "Buscar:"
 msgid "Search"
 msgstr "Buscar"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Engadir criterio"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Excepcións"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Información da Fonte"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13881,26 +14823,31 @@ msgstr "Sinatura _HTML:"
 msgid "Name:"
 msgstr "Nome:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13909,90 +14856,90 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -14054,11 +15001,11 @@ msgstr "Remitir"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
@@ -14115,44 +15062,140 @@ msgstr "_Subscribir"
 msgid "_Unsubscribe"
 msgstr "_Desubscribir"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "O shell de Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Opcións"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Renomear este grupo de atallos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Trocar a mostra da barra de cartafoles"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Agochar a barra de atallos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Prioridade:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Prioridade:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interface de configuración do correo"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Seleccionar Cartafol"
+msgid "Path to the default contacts folder"
+msgstr "Abrindo cartafol %s"
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "Borrador"
+msgid "Path to the default mail folder"
+msgstr "Abrindo cartafol %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Entrada"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Abrindo cartafol %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Saída"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "Vista"
+msgid "Physical URI to the default tasks folder"
+msgstr "Abrindo cartafol %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Trocar a mostra da barra de cartafoles"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Trocar a mostra da barra de atallos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Correo Electrónico"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -14163,7 +15206,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -14172,7 +15215,7 @@ msgstr ""
 "Ocorreu un erro ao copiar ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -14183,7 +15226,7 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14290,10 +15333,11 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "O nome de cartafol indicado non é válido: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14317,20 +15361,15 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Crear un _Novo Cartafol..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14344,11 +15383,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará "
 "averigualo."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14356,7 +15395,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14365,23 +15404,23 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14390,11 +15429,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14403,17 +15442,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14422,34 +15461,34 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14457,46 +15496,28 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuracións existentes"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Sincronizando '%s'"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Sincronizando cartafol"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizando '%s'"
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14537,7 +15558,7 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14546,17 +15567,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asistente"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Novo"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Non se especificou un nome de cartafol"
@@ -14619,64 +15634,51 @@ msgstr "Crear un novo atallo"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Escolla o cartafol ao que quere que apunte o atallo:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ningún cartafol visualizado)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nada)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion está conectado. Prema neste botón para desconectar."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution está desconectándose"
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution está desconectado. Prema neste botón para conectar."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumentos non válidos"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Erro xenérico"
 
@@ -14796,75 +15798,18 @@ msgstr "Eli_minar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Entrada"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Atallos"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Sen erros"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Xa existe un cartafol co mesmo nome"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "O tipo do cartafol indicado non é válido"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Erro de E/S"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Non hai espacio dabondo para crear o cartafol"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Non se atopou o cartafol indicado"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Función non implementada neste medio de armacenamento"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operación non soportada"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "O tipo especificado non está soportado neste almacenamento"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "O cartafol especificado non se pode modificar ou eliminar"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
-
-#: shell/e-storage.c:597
-#, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14875,6 +15820,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Novo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Abrir en %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -14901,87 +15857,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-#, fuzzy
-msgid "CORBA error"
-msgstr "Erro de E/S"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-#, fuzzy
-msgid "Invalid argument"
-msgstr "Argumentos non válidos"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "Nada"
-
-#: shell/evolution-shell-component.c:1197
-#, fuzzy
-msgid "Not found"
-msgstr "Tarxeta non atopada"
-
-#: shell/evolution-shell-component.c:1199
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Dete_ctar tipos soportados "
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-#, fuzzy
-msgid "Unsupported operation"
-msgstr "O usuario cancelou a operación."
-
-#: shell/evolution-shell-component.c:1205
-#, fuzzy
-msgid "Internal error"
-msgstr "Outro erro"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "Existe"
-
-#: shell/evolution-shell-component.c:1211
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Non válido"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "Non existe o cartafol %s"
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "Ningunha Mensaxe Seleccionada"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Tipo de ficheiro:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Compositor de correo de Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -15015,11 +15890,6 @@ msgstr "_Correo"
 msgid "_Tasks:"
 msgstr "Tarefas"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Nome do cartafol:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -15080,25 +15950,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "O shell de Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Opcións"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Prema en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -15141,7 +15992,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importar"
 
@@ -15157,17 +16008,17 @@ msgstr "Non preguntar de novo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Fiestra de Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15199,7 +16050,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -15208,71 +16059,114 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 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:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Seleccionar Cartafol"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "En Progreso"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expresión"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Enderezo de Correo:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "ID do certificado:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Expendedor: %s\n"
+"Asunto: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Expendedor: %s\n"
+"Asunto: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15328,92 +16222,378 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nome Común"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID do certificado:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Editar"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
 msgstr "Non se especificaron destinatarios."
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Non se puido verifica-los certificados."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expresión"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organización"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organización"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Vista"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importar"
+msgid "Certificate already exists"
+msgstr "O ID da Tarxeta xa existe"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr ", "
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Aceptar"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Clave Pública: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "O asunto é %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Incapaz de procesar o cartafol spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Non se puido verifica-los certificados."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Opcións"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Sen Información"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "anexo"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Croacia"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Croacia"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expresión"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "Servidor %s %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Ficheiro de sinatura:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Inserir"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "O asunto é %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Ficheiro de sinatura:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID do certificado:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15469,7 +16649,7 @@ msgstr "Copiar a selección"
 msgid "Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
@@ -15487,7 +16667,7 @@ msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 msgid "Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portarretallos"
 
@@ -15495,8 +16675,8 @@ msgstr "Pegar o contido do portarretallos"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pre_visualización da Impresión"
@@ -15542,13 +16722,13 @@ msgstr "Parar a Carga"
 msgid "View the current contact"
 msgstr "a hora actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Accións"
 
@@ -15578,145 +16758,114 @@ msgid "_Send Message to Contact..."
 msgstr "Enviar unha _Mensaxe ao Contacto..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Crear unha nova cita"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Crear unha nova cita"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Crear unha nova tarefa"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Crear unha nova tarefa"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Borrar esta cita"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir A"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Atrás"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Adiante"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Ir á _Data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ir á data especificada"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ir ó día de hoxe"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Brétema"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nova C_ita"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nova Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Xuntanza"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Nova T_arefa"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar información de Libre/Ocupado para esta axenda"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Fontes"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Cartafol que contén citas e eventos"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Amosa-los Detalles"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Amosar un día"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Semana"
 
@@ -15781,7 +16930,7 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -16009,7 +17158,7 @@ msgstr "Marcar Todas como L_idas"
 msgid "Mark all visible messages as read"
 msgstr "Marcar as mensaxes visibles como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar a mensaxe do portarretallos"
@@ -16067,16 +17216,6 @@ msgstr "_Inverter Selección"
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por Fíos"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Pechar"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -16241,278 +17380,303 @@ msgstr "Remiti-lo correo seleccionado a alguén coma un anexo"
 msgid "Increase the text size"
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Cargar _Imaxes"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marcar como _Non Lida"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como Non Imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar as mensaxes seleccionadas coma importante"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marcar as mensaxes seleccionadas coma non importantes"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar as mensaxes seleccionadas coma non importantes"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Seguinte Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Seguinte Fío"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Seguinte Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Tarxeta non atopada"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abri-la mensaxe seleccionada no compositor para re-enviala"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Anterior Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Resposta á Tarefa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Anterior Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a alguén"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Buscar M_ensaxe..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up 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:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Amosar o Código _Fonte da Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con tódalas cabeceiras"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo código fonte sen procesar da mensaxe"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "CartafolV pola _Lista de Correo"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "CartafolV polo Au_tor"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "CartafolV polos _Destinatarios"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "CartafolV polo A_sunto"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Remitir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir A"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Inline"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Visualización _Normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Renomear..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Recuperar"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Pechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -16802,12 +17966,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Saír"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Crear unha nova tarefa"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Fiestra de Evolution"
+msgid "E_xit"
+msgstr "_Saír"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16819,8 +17984,8 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Fiestra de Evolution"
+msgid "Open a new window"
+msgstr "Abrir nunha Nova Fiestra"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16828,58 +17993,72 @@ msgid "Pi_lot Settings..."
 msgstr "_Preferencias de Correo..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuración do Correo"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar información sobre Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Trocar"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Novo"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Buscar Agora"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
@@ -17021,12 +18200,12 @@ msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -17164,7 +18343,7 @@ msgstr "_Buscar"
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
@@ -17183,25 +18362,265 @@ msgstr ""
 msgid "Text"
 msgstr "Proba"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Limpar"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Buscar Agora"
 
+#~ msgid "Account Name"
+#~ msgstr "Nome da Conta"
+
+#~ msgid "Server Name"
+#~ msgstr "Nome do Servidor"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Cancela-la operación de correo actual"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(SSL non está soportado nesta versión de evolution)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Outros Contactos"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nome Completo:"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
 
 #, fuzzy
-#~ msgid "Family Name"
-#~ msgstr "Nome Completo:"
+#~ msgid "Add LDAP Server"
+#~ msgstr "Servidor NNTP:"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Configuración do Correo"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Prema aquí para engadir un contacto *"
+
+#~ msgid "Business Address"
+#~ msgstr "Enderezo do Traballo"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL libre-ocupado"
+
+#~ msgid "ISDN"
+#~ msgstr "RDSI"
+
+#~ msgid "Profession"
+#~ msgstr "Profesión"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#, fuzzy
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Abrindo armacenamento %s"
+
+#, fuzzy
+#~ msgid "Send anyway?"
+#~ msgstr "Enviar unha mensaxe"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Nome do cartafol:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Ficheiro de sinatura HTML:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Conectando ao servidor..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Este cartafol non pode conter mensaxes."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Non foi posible renomear o cartafol: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Escolla un cartafol de destino para importar estes datos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible borrar o cartafol:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Seleccionar Cartafol"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Borrador"
+
+#~ msgid "Outbox"
+#~ msgstr "Saída"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Vista"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Sincronizando '%s'"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Sincronizando cartafol"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronizando '%s'"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ningún cartafol visualizado)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Nada)"
+
+#~ msgid "No error"
+#~ msgstr "Sen erros"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Xa existe un cartafol co mesmo nome"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "O tipo do cartafol indicado non é válido"
+
+#~ msgid "I/O error"
+#~ msgstr "Erro de E/S"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Non hai espacio dabondo para crear o cartafol"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Non se atopou o cartafol indicado"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Función non implementada neste medio de armacenamento"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operación non soportada"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "O cartafol especificado non se pode modificar ou eliminar"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr ""
+#~ "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
+#, fuzzy
+#~ msgid "CORBA error"
+#~ msgstr "Erro de E/S"
+
+#, fuzzy
+#~ msgid "Invalid argument"
+#~ msgstr "Argumentos non válidos"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "Nada"
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Dete_ctar tipos soportados "
+
+#, fuzzy
+#~ msgid "Unsupported operation"
+#~ msgstr "O usuario cancelou a operación."
+
+#, fuzzy
+#~ msgid "Internal error"
+#~ msgstr "Outro erro"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "Existe"
+
+#, fuzzy
+#~ msgid "Invalid URI"
+#~ msgstr "Non válido"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "Non existe o cartafol %s"
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "Ningunha Mensaxe Seleccionada"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Tipo de ficheiro:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Compositor de correo de Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Crear unha nova cita"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nova C_ita"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Xuntanza"
+
+#~ msgid "New _Task"
+#~ msgstr "Nova T_arefa"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Fiestra de Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Fiestra de Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Trocar"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Cancela-la operación de correo actual"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17302,10 +18721,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Compositor de correo de Evolution."
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Agardando..."
-
-#, fuzzy
 #~ msgid "Searching..."
 #~ msgstr "Buscar M_ensaxe..."
 
@@ -17358,10 +18773,6 @@ msgstr "Buscar Agora"
 #~ msgstr "EBook non cargado\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "O ID da Tarxeta xa existe"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operación cancelada"
 
@@ -17568,10 +18979,6 @@ msgstr "Buscar Agora"
 #~ msgstr "%x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Nada"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr ""
 #~ "\n"
@@ -17586,10 +18993,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Principal"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Pegar"
 
@@ -17604,10 +19007,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Cartafol que contén información de contacto"
 
 #, fuzzy
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor NNTP:"
-
-#, fuzzy
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Cartafol que contén información de contacto"
 
@@ -17619,20 +19018,6 @@ msgstr "Buscar Agora"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Cartafol que contén información de contacto"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Crear un novo contacto"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nova Lista de Contactos"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Crear unha nova lista de contactos"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -17650,9 +19035,6 @@ msgstr "Buscar Agora"
 #~ msgid "Is New Card"
 #~ msgstr "Novo"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Sen tarxetas"
 
@@ -17701,37 +19083,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Cartafol que contén elementos para-facer"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Nova Cita"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Cita"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Configuración da Fonte de Novas"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Xuntanza"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Nova Tarefa"
-
-#~ msgid "_Task"
-#~ msgstr "_Tarefa"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nova Cita"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Nova C_ita"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Non foi posible actualizar os ficheiros correctamente"
 
@@ -17764,10 +19115,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Abrir axenda"
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Abrindo cartafol %s"
-
-#, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "Examinando %s"
 
@@ -17806,10 +19153,6 @@ msgstr "Buscar Agora"
 #~ "Evolution atopou ficheiros GnomeCard.\n"
 #~ "¿Gostaríalle importalos a Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interface de configuración do correo"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Cartafol que contén correo"
 
@@ -17827,25 +19170,12 @@ msgstr "Buscar Agora"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Cartafol de Lixo Virtual"
 
-#~ msgid "Properties..."
-#~ msgstr "Propiedades..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Modificar as propiedades deste cartafol"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "Non definiu ningún método de envío de correo"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nova Mensaxe de Correo"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Enviar _Mensaxe"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Compoñer unha mensaxe"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Seguinte Mensaxe"
@@ -19172,10 +20502,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Canadá"
 
 #, fuzzy
-#~ msgid "Curitiba"
-#~ msgstr "Croacia"
-
-#, fuzzy
 #~ msgid "Custer"
 #~ msgstr "Cortar"
 
@@ -21827,10 +23153,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Data Completada:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Opcións"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Opcións"
 
@@ -22135,10 +23457,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Emiratos Árabes Unidos"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Non vista"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "Xapón"
 
@@ -22203,10 +23521,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Unicode"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "mes"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "Xeral"
 
@@ -22487,10 +23801,6 @@ msgstr "Buscar Agora"
 #~ msgstr ", "
 
 #, fuzzy
-#~ msgid " C"
-#~ msgstr ", "
-
-#, fuzzy
 #~ msgid "knots"
 #~ msgstr "nós"
 
@@ -23114,10 +24424,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Calixe conxelante"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "Orballo"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Orballo nas proximidades"
 
@@ -23471,19 +24777,6 @@ msgstr "Buscar Agora"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Crear un _Novo Cartafol..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Enviar / Recibir"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Enviar o correo na cola e recibir o correo novo"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Trocar a mostra da barra de cartafoles"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Trocar a mostra da barra de atallos"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Ver o cartafol seleccionado"
 
@@ -23513,9 +24806,6 @@ msgstr "Buscar Agora"
 #~ msgid "_Rename..."
 #~ msgstr "_Renomear..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Enviar / Recibir"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Barra de _Atallos"
 
@@ -23567,10 +24857,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Modifica-las preferencias"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "Comprobar _automaticamente se hai correo novo cada"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Este"
 
@@ -23692,18 +24978,10 @@ msgstr "Buscar Agora"
 #~ msgstr "123"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "_Eliminar"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Opcións"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Personalizar"
 
@@ -24321,13 +25599,6 @@ msgstr "Buscar Agora"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "_Borrar esta Cita"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Expendedor: %s\n"
-#~ "Asunto: %s"
-
 #, fuzzy
 #~ msgid "I/O Error: %s"
 #~ msgstr "Erro de E/S"
@@ -24373,9 +25644,6 @@ msgstr "Buscar Agora"
 #~ msgid "News Servers"
 #~ msgstr "Fontes de _Novas"
 
-#~ msgid "Source Information"
-#~ msgstr "Información da Fonte"
-
 #~ msgid "newswindow1"
 #~ msgstr "fiestranovas1"
 
@@ -24396,9 +25664,6 @@ msgstr "Buscar Agora"
 #~ "O tipo do cartafol seleccionado non é válido para\n"
 #~ "a operación solicitada."
 
-#~ msgid "_Contact List"
-#~ msgstr "Lista de _Contactos"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Introducir _Ficheiro de Texto..."
 
@@ -24414,18 +25679,11 @@ msgstr "Buscar Agora"
 #~ msgid "Send _later"
 #~ msgstr "Enviar máis _tarde"
 
-#~ msgid "Send the message later"
-#~ msgstr "Enviar a mensaxe máis tarde"
-
 #, fuzzy
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Preferencias de Correo..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Fontes do Libro de Enderezos"
-
-#, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
 
@@ -24791,13 +26049,6 @@ msgstr "Buscar Agora"
 #~ "\n"
 #~ "Cadea Exclusiva: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Clave Pública: "
-
 #, fuzzy
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Conectando ao servidor..."
@@ -24854,9 +26105,6 @@ msgstr "Buscar Agora"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "República de Moldavia"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "_Crear novas citas cun recordatorio por defecto"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "_Primeiro día da semana:"
 
@@ -24980,9 +26228,6 @@ msgstr "Buscar Agora"
 #~ msgid "Composer"
 #~ msgstr "Compoñedor"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "O estilo de Remitir por defecto é: "
-
 #~ msgid "Edit..."
 #~ msgstr "Editar..."
 
@@ -24992,15 +26237,9 @@ msgstr "Buscar Agora"
 #~ msgid "_Email Address:"
 #~ msgstr "_Enderezo de Correo:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Rexistrar as accións do filtro a:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organización:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Enviar as mensaxes en formato HTML por defecto."
-
 #, fuzzy
 #~ msgid "_Server Type: "
 #~ msgstr "Tipo de Servidor: "
@@ -25193,9 +26432,6 @@ msgstr "Buscar Agora"
 #~ msgid "Encrypted message not displayed"
 #~ msgstr "Non se amosa a mensaxe cifrada"
 
-#~ msgid "Encrypted message"
-#~ msgstr "Mensaxe cifrada"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Prema na icona para descifrar."
 
@@ -25321,9 +26557,6 @@ msgstr "Buscar Agora"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -25411,9 +26644,6 @@ msgstr "Buscar Agora"
 #~ msgid "Could not open folder to summarise: %s: %s"
 #~ msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d/%m/%Y"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
@@ -25477,9 +26707,6 @@ msgstr "Buscar Agora"
 #~ msgid "???"
 #~ msgstr "???"
 
-#~ msgid "_Company:"
-#~ msgstr "_Compañía:"
-
 #~ msgid "USA"
 #~ msgstr "Estados Unidos"
 
@@ -25823,9 +27050,6 @@ msgstr "Buscar Agora"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (mensaxe remitida)"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Mensaxe remitida (sen asunto)"
-
 #~ msgid ""
 #~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
 #~ "s<br><b>Subject:</b> %s<br>"