disted

svn path=/trunk/; revision=25711
author: Jeffrey Stedfast <fejj@src.gnome.org> 2004-04-30 23:01:36 +0800
committer: Jeffrey Stedfast <fejj@src.gnome.org> 2004-04-30 23:01:36 +0800
commit: 1c8f61ea0bea3c97d3b6339a989882ab2180749a (patch)
tree: b381ee25a790ae7ab0110d9ae2044ec915227212 /po/gl.po
parent: 448012d42619872149723008d6490497ed24618a (diff)
download: gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.gz
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.zst
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.zip
1 files changed, 2574 insertions, 1968 deletions
diff --git a/po/gl.po b/po/gl.po
index 642c1ed32c..7dd8ee44b8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-19 11:44-0400\n"
+"POT-Creation-Date: 2004-04-29 13:14-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -74,8 +74,8 @@ msgstr "Enderezo de Correo:"
 msgid "Could not load addressbook"
 msgstr "Non foi posible cargar %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1214
-#: addressbook/conduit/address-conduit.c:1217
+#: addressbook/conduit/address-conduit.c:1219
+#: addressbook/conduit/address-conduit.c:1222
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
@@ -99,9 +99,8 @@ msgstr "Crear ou editar contas de correo e outras preferencias"
 #.
 #. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/gui/component/addressbook-component.c:522
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:363
+#: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -149,77 +148,50 @@ msgstr "Fábrica para o compoñente de correo de Evolution."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:227
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:315
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "New Address Book"
-msgstr "Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-component.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:368
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Eliminar"
-
-#: addressbook/gui/component/addressbook-component.c:317
-#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:370
-msgid "Properties..."
-msgstr "Propiedades..."
-
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
 msgid "New Contact"
 msgstr "Novo Contacto:"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:94
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:95
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:570
+#: addressbook/gui/component/addressbook-component.c:101
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:102
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:103
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crear unha nova lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:109
 #, fuzzy
 msgid "New Contacts Group"
 msgstr "Novo Contacto:"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
 msgid "_Contacts Group"
 msgstr "Co_ntactos:"
 
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:111
 #, fuzzy
 msgid "Create a new contacts group"
 msgstr "Crear un novo grupo de atallos"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:466
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -227,7 +199,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:431
+#: addressbook/gui/component/addressbook-config.c:490
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -235,76 +207,77 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:459
+#: addressbook/gui/component/addressbook-config.c:518
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:785
+#: addressbook/gui/component/addressbook-config.c:822
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1217
+#: addressbook/gui/component/addressbook-config.c:1216
 #, 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:1238
+#: addressbook/gui/component/addressbook-config.c:1237
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1246
+#: addressbook/gui/component/addressbook-config.c:1245
 #, 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-migrate.c:58
-#: calendar/gui/migration.c:128 mail/em-migrate.c:1072
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
 #, fuzzy
 msgid "Migrating..."
 msgstr "Agardando..."
 
-#: addressbook/gui/component/addressbook-migrate.c:98
-#: calendar/gui/migration.c:175 mail/em-migrate.c:1113
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Examinando %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:408
-#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: addressbook/gui/component/addressbook-migrate.c:438
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:239
+#: mail/mail-component.c:242
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:416
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:926 mail/mail-config.c:67
+#: addressbook/gui/component/addressbook-migrate.c:446
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:424
+#: addressbook/gui/component/addressbook-migrate.c:454
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:552
+#: addressbook/gui/component/addressbook-migrate.c:582
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:672
+#: addressbook/gui/component/addressbook-migrate.c:702
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data na que se completa"
 
-#: addressbook/gui/component/addressbook-migrate.c:853
+#: addressbook/gui/component/addressbook-migrate.c:1076
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -312,18 +285,33 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:869
+#: addressbook/gui/component/addressbook-migrate.c:1090
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:622
+#: addressbook/gui/component/addressbook-migrate.c:1099
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:1109
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:89
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:693
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -331,21 +319,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:699
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:1025
-#, fuzzy
-msgid "UID of the contacts source that the view will display"
-msgstr "O URI que ha amosar a axenda"
-
-#: addressbook/gui/component/addressbook.c:1030
-#, fuzzy
-msgid "The URI that the address book will display"
-msgstr "O URI que ha amosar a axenda"
-
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -371,7 +350,7 @@ msgstr "Dete_ctar tipos soportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
@@ -391,136 +370,206 @@ msgid "*"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
+msgid "1"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:4
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "5"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
-msgid "Address Book Creation Assistant"
-msgstr "Fontes do Libro de Enderezos"
+msgid "<b>Authentication</b>"
+msgstr "Autenticación"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<b>Downloading</b>"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "Buscar M_ensaxe..."
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "Información da Fonte"
+
+#: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "Co_ntactos:"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anónimo"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid ""
-"Congratulations, you are\n"
-"\t      finished setting up this address book.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:20
+#: calendar/gui/dialogs/task-editor.c:193
+msgid "Basic"
+msgstr "Básico"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "P_echar"
+
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Detalles"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "Distinguished name"
+msgstr "_Nome da lista:"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Download limit:"
+msgstr "Cargar _Imaxes"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Email address"
+msgstr "Enderezo de Correo:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:31
 #, fuzzy
-msgid "Finished"
-msgstr "B_uscar"
+msgid "Find Possible Search Bases"
+msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:32
+#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-#, fuzzy
-msgid "Group:"
-msgstr "Grupo"
-
-#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
 #: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "One"
 msgstr "Único"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "Only locations within starting point"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Escoller unha cor"
+
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:38
+#, fuzzy
+msgid "Search base only"
+msgstr "_Base da busca:"
+
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
+msgid "Search base:"
+msgstr "_Base da busca:"
+
+#: addressbook/gui/component/ldap-config.glade.h:40
+#, fuzzy
+msgid "Search scope:"
+msgstr "Ámbito da busca:"
+
+#: addressbook/gui/component/ldap-config.glade.h:41
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -531,7 +580,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -540,60 +589,20 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editing contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Specifying a\n"
-"\t\t\t  display name and group is the first step in setting\n"
-"\t\t\t  up an address book."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-#: calendar/gui/dialogs/calendar-setup.glade.h:20
-msgid "Step 1: Folder Characteristics"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#, fuzzy
-msgid "Step 2: Server Information"
-msgstr "Información da Fonte"
-
-#: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 3: Connecting to Server"
-msgstr "Conectando ao servidor..."
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "Step 4: Searching the Directory"
-msgstr "Conectando ao servidor..."
-
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
-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 "
-"if you\n"
-"need to change these options."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -601,7 +610,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -611,37 +620,27 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
-msgid ""
-"This assistant will help you\n"
-"\t      create a new address book. \n"
-"\n"
-"Depending on the type of address book 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:67
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:63
 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:71
+#: addressbook/gui/component/ldap-config.glade.h:64
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -651,17 +650,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
-#: calendar/gui/dialogs/calendar-setup.glade.h:34
-#, 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:74
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -669,85 +658,119 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Timeout:"
+msgstr "Formato da hora:"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-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:75
+#, fuzzy
+msgid "_Add Contacts Group"
+msgstr "Co_ntactos:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-#: calendar/gui/dialogs/calendar-setup.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:76
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:78
+#, fuzzy
+msgid "_Email address:"
+msgstr "Enderezo de Correo:"
+
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:80
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: addressbook/gui/component/ldap-config.glade.h:81
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:82
+#, fuzzy
+msgid "_Port:"
+msgstr "_Prioridade:"
+
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
+#, fuzzy
+msgid "_Server:"
+msgstr "Nome do _Servidor:"
+
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:87
+#, fuzzy
+msgid "_Use secure connection:"
+msgstr "Usar conexión segura (_SSL)"
+
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:91
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:182
+msgid "minutes"
+msgstr "minutos"
+
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
@@ -757,37 +780,37 @@ msgstr "Buscar M_ensaxe..."
 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:206
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
 msgid "Remove All"
 msgstr "Eliminar Todos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:213
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
-#: calendar/gui/dialogs/cal-prefs-dialog.c:734
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:220
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:220
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact Info"
 msgstr "Editar Información de Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:227
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 msgid "Send HTML Mail?"
 msgstr "¿Enviar Correo HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:320
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
 #: addressbook/gui/widgets/eab-popup-control.c:983
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:346
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
@@ -834,220 +857,262 @@ msgstr "_Categoría:"
 msgid "_Find"
 msgstr "Buscar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
-msgid " B_usiness:"
-msgstr "T_raballo"
+msgid "<b>Email</b>"
+msgstr "Enviando Correo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
-msgid "A_ddress..."
-msgstr "_Enderezo..."
+msgid "<b>Home</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #, fuzzy
-msgid "A_ssistant's name:"
-msgstr "Nome do _asistente:"
+msgid "<b>Instant Messaging</b>"
+msgstr "Anterior Mensaxe"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
-msgid "Addressbook:"
-msgstr "Libro de Enderezos"
+msgid "<b>Job</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "Anni_versary:"
-msgstr "Ani_versario:"
+#, fuzzy
+msgid "<b>Miscellaneous</b>"
+msgstr "Enviando Correo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
-msgid "Birthda_y:"
-msgstr "_Aniversario:"
+msgid "<b>Other</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
-msgid "Blog address:"
-msgstr "Enderezo de Correo:"
+msgid "<b>Telephone</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
-msgid "Business fa_x:"
-msgstr "Fax do Traballo"
+msgid "<b>Web Addresses</b>"
+msgstr "Enviando Correo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "Collaboration"
-msgstr ""
+#, fuzzy
+msgid "<b>Work</b>"
+msgstr "Semana Laboral"
 
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1202
-#: addressbook/gui/contact-editor/e-contact-editor.c:2019
-msgid "Contact Editor"
-msgstr "Editor de Contactos"
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/widgets/eab-contact-display.c:302
+#: addressbook/gui/widgets/eab-contact-display.c:321
+msgid "AIM"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "D_epartment:"
-msgstr "_Departamento:"
+msgid "Address 2:"
+msgstr "Enderezo _2:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Detalles"
+#, fuzzy
+msgid "Address:"
+msgstr "_Enderezo:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Enter the person's instant messenger accounts here."
-msgstr ""
+#, fuzzy
+msgid "Anniversary:"
+msgstr "Ani_versario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
-msgid "F_ree/Busy URL:"
-msgstr "URL libre-ocupado"
+msgid "Assistant:"
+msgstr "Asistente"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
-msgid "File a_s:"
-msgstr "Ar_quivar coma:"
+msgid "Birthday:"
+msgstr "_Aniversario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
-msgid "Full _Name..."
-msgstr "Nome _Completo..."
+msgid "Blog:"
+msgstr "para sempre"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Calendar:"
+msgstr "Axenda"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid ""
-"If this person has the ability to participate in a video conference, enter "
-"their address here."
-msgstr ""
+#, fuzzy
+msgid "City:"
+msgstr "_Cidade:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
-msgstr ""
+#, fuzzy
+msgid "Company:"
+msgstr "Compañía"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:181
 #, fuzzy
-msgid "Instant Messaging"
-msgstr "Anterior Mensaxe"
+msgid "Contact"
+msgstr "Contactos"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+msgid "Contact Editor"
+msgstr "Editor de Contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "New phone type"
-msgstr "Novo tipo de teléfono"
+#, fuzzy
+msgid "Country:"
+msgstr "_País:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "No_tes:"
-msgstr "No_tas:"
+#, fuzzy
+msgid "Department:"
+msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Organi_zation:"
-msgstr "Organi_zación:"
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "URL libre-ocupado"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
-msgid "P_rofession:"
-msgstr "_Profesión:"
+msgid "Full _Name..."
+msgstr "Nome _Completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Primary _email:"
-msgstr "Correo Electrónico Principal"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
+msgid "Home"
+msgstr "Particular"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
-msgid "S_pouse:"
-msgstr "_Cónxuxe:"
+msgid "Job title:"
+msgstr "_Posto de traballo:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Wants to receive _HTML mail"
-msgstr "Quere recibir correo en _HTML"
+#: calendar/gui/e-itip-control.c:936
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Add"
-msgstr "_Engadir"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#, fuzzy
+msgid "MSN Messenger"
+msgstr "Enviar _Mensaxe"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
-msgid "_Business:"
-msgstr "_Traballo"
+msgid "Mailing Address"
+msgstr "Enderezo de Correo:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
-msgid "_Categories..."
-msgstr "Ca_tegorías..."
+msgid "Manager:"
+msgstr "Xestor"
 
-#. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651
-#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
-#: mail/em-folder-tree.c:2570 mail/em-folder-view.c:794
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Borrar"
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "_Alcume:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 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:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Editar"
+#, fuzzy
+msgid "Notes:"
+msgstr "No_tas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
-msgid "_Home:"
-msgstr "_Particular"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Job title:"
-msgstr "_Posto de traballo:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
-msgid "_Manager's name:"
-msgstr "Nome do _Administrador:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
+msgid "Other"
+msgstr "Outro"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
-msgid "_Mobile:"
-msgstr "_Móbil"
+msgid "Personal Information"
+msgstr "Información Opcional"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "_Nickname:"
-msgstr "_Alcume:"
+#, fuzzy
+msgid "Profession:"
+msgstr "_Profesión:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "_Office:"
-msgstr "_Oficina:"
+#, fuzzy
+msgid "State/Province:"
+msgstr "E_stado/Provincia:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
-msgid "_Public Calendar URL:"
-msgstr "Imprimir Axenda"
+msgid "Wants to receive HTML mail"
+msgstr "Quere recibir correo en _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "_This is the mailing address"
-msgstr "_Este é o enderezo de correo"
+msgid "Webcam:"
+msgstr "Páxina"
 
+#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-msgid "_Video Conferencing URL:"
-msgstr ""
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:193
+#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Work"
+msgstr "Traballando"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "_Web page address:"
-msgstr "Enderezo da páxina _Web:"
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr ""
+"\n"
+"  Código Postal: "
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "Categorías"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "Nome do ficheiro:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#, fuzzy
+msgid "_Where:"
+msgstr "Nome do _Servidor:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+msgid "item7"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "item8"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #, fuzzy
 msgid "Address"
 msgstr "_Enderezo:"
@@ -1055,14 +1120,14 @@ msgstr "_Enderezo:"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:281
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:173
+#: addressbook/gui/widgets/e-minicard.c:174
 #, fuzzy
 msgid "Editable"
 msgstr "Activado"
@@ -2054,14 +2119,10 @@ msgstr "Cimbabue"
 msgid "AOL Instant Messenger"
 msgstr "Anterior Mensaxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2835
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:305
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
@@ -2070,27 +2131,20 @@ msgstr "Contacto Sen Nome"
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#, fuzzy
-msgid "MSN Messenger"
-msgstr "Enviar _Mensaxe"
-
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2838
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "ICQ"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:704
 #, fuzzy
 msgid "Service"
 msgstr "Engadir Servicio"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:727
-#: calendar/gui/dialogs/cal-prefs-dialog.c:580
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
 #: calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "Location"
@@ -2103,106 +2157,58 @@ msgstr ""
 msgid "Username"
 msgstr "Nome de _Usuario:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2503
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
-msgid "Home"
-msgstr "Particular"
-
-#. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: filter/filter-label.c:122 mail/em-migrate.c:925 mail/mail-config.c:66
-#: mail/mail-config.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 #, fuzzy
-msgid "Work"
-msgstr "Traballando"
+msgid "Yahoo"
+msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2504
-#: addressbook/gui/contact-editor/e-contact-editor.c:2807
-msgid "Other"
-msgstr "Outro"
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/widgets/eab-contact-display.c:306
+#: addressbook/gui/widgets/eab-contact-display.c:325
+msgid "MSN"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:217
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:246
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:224
+#: addressbook/gui/contact-editor/e-contact-editor.c:253
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:231
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:159
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:180
-#, fuzzy
-msgid "Contact"
-msgstr "Contactos"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:238
+#: addressbook/gui/contact-editor/e-contact-editor.c:267
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:245
+#: addressbook/gui/contact-editor/e-contact-editor.c:274
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:288
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:718
-msgid "Account Name"
-msgstr "Nome da Conta"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1485
+#: addressbook/gui/contact-editor/e-contact-editor.c:1656
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1493
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#, fuzzy
-msgid "Save Contact as VCard"
-msgstr "Gardar como VCard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2502
-msgid "Business"
-msgstr "Traballo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2834
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
-msgid "AIM"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2836
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#, fuzzy
-msgid "Yahoo"
-msgstr "India"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2837
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:328
-msgid "MSN"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2839
-#, fuzzy
-msgid "GroupWise"
-msgstr "Grupo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: addressbook/gui/contact-editor/e-contact-editor.c:2495
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
@@ -2398,7 +2404,7 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr "editor-de-contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:152
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
@@ -2408,18 +2414,18 @@ msgstr "editor-de-contactos"
 msgid "Book"
 msgstr "Corpo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #, fuzzy
 msgid "Is New List"
 msgstr "Nova Lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:214
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:756
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:434
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
@@ -2462,8 +2468,8 @@ msgstr ""
 "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:154
+#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
@@ -2513,13 +2519,13 @@ msgid "Email begins with"
 msgstr "remata en"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
@@ -2619,7 +2625,7 @@ msgid "Cut"
 msgstr "Cortar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:366
+#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2630,8 +2636,18 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Eliminar"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1248
+#: calendar/gui/e-calendar-view.c:1262
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -2646,7 +2662,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:359
+#: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
@@ -2687,7 +2703,7 @@ msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:515 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -2742,7 +2758,7 @@ msgid "Manager"
 msgstr "Xestor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
@@ -2751,7 +2767,7 @@ msgid "Nickname"
 msgstr "Alcume"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Note"
 msgstr "Nota"
 
@@ -2760,7 +2776,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:300
 msgid "Organization"
 msgstr "Organización"
 
@@ -2818,19 +2834,19 @@ msgid "Web Site"
 msgstr "Sitio Web"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:136
+#: addressbook/gui/widgets/e-minicard.c:137
 #, fuzzy
 msgid "Width"
 msgstr "Largura:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:143
+#: addressbook/gui/widgets/e-minicard.c:144
 #, fuzzy
 msgid "Height"
 msgstr "Altura:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:151
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
@@ -2890,160 +2906,191 @@ msgstr ""
 msgid "Adapter"
 msgstr "Andorra"
 
-#: addressbook/gui/widgets/e-minicard.c:159
+#: addressbook/gui/widgets/e-minicard.c:160
 #, fuzzy
 msgid "Selected"
 msgstr "Eliminada"
 
-#: addressbook/gui/widgets/e-minicard.c:166
+#: addressbook/gui/widgets/e-minicard.c:167
 #, fuzzy
 msgid "Has Cursor"
 msgstr "Ordeamento das tarefas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
-#: addressbook/gui/widgets/eab-contact-display.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:114
+#: addressbook/gui/widgets/eab-contact-display.c:177
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
-#: addressbook/gui/widgets/eab-contact-display.c:193
+#: addressbook/gui/widgets/eab-contact-display.c:124
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:496
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:493
 #, fuzzy
 msgid "List Members"
 msgstr "Membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:296
+#: addressbook/gui/widgets/eab-contact-display.c:293
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:301
 #, fuzzy
 msgid "Position"
 msgstr "Estonia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:322
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:308
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:312
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:330
 #, fuzzy
 msgid "Phone"
 msgstr "Nada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:313
+#: addressbook/gui/widgets/eab-contact-display.c:310
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:317
+#: addressbook/gui/widgets/eab-contact-display.c:314
 #, fuzzy
 msgid "work"
 msgstr "Traballando"
 
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
-#: addressbook/gui/widgets/eab-contact-display.c:550
+#: addressbook/gui/widgets/eab-contact-display.c:328
+#: addressbook/gui/widgets/eab-contact-display.c:547
 #, fuzzy
 msgid "Blog"
 msgstr "para sempre"
 
-#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "personal"
 msgstr "Xeral"
 
-#: addressbook/gui/widgets/eab-contact-display.c:511
+#: addressbook/gui/widgets/eab-contact-display.c:508
 #, fuzzy
 msgid "Job Title"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:542
+#: addressbook/gui/widgets/eab-contact-display.c:539
 #, fuzzy
 msgid "Home page"
 msgstr "Fax Particular"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Éxito"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Erro descoñecido"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova Lista de Contactos"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
-#: calendar/gui/print.c:2349 camel/camel-service.c:728
-#: camel/camel-service.c:766 camel/camel-service.c:850
-#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "A autenticación fallou."
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
-msgid "Address Book does not exist"
-msgstr "O cartafol `%s' non existe."
+msgid "No such source"
+msgstr "Non existe a mensaxe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -3052,7 +3099,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/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3062,7 +3109,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:114
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -3074,7 +3121,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:111
+#: addressbook/gui/widgets/eab-gui-util.c:123
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3084,11 +3131,11 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/widgets/eab-gui-util.c:128
+#: addressbook/gui/widgets/eab-gui-util.c:140
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3096,7 +3143,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3104,64 +3151,64 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:161
+#: addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:164
+#: addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Do you want to save changes?"
 msgstr "¿Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:195
+#: addressbook/gui/widgets/eab-gui-util.c:207
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimir tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:214
+#: addressbook/gui/widgets/eab-gui-util.c:228
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:214
-#: addressbook/gui/widgets/eab-gui-util.c:632
+#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:650
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:223
+#: addressbook/gui/widgets/eab-gui-util.c:239
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:223
+#: addressbook/gui/widgets/eab-gui-util.c:239
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:251
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
-#: addressbook/gui/widgets/eab-gui-util.c:590
+#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:608
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: addressbook/gui/widgets/eab-gui-util.c:333
 #, 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:341
+#: addressbook/gui/widgets/eab-gui-util.c:359
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3170,56 +3217,56 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:345
+#: addressbook/gui/widgets/eab-gui-util.c:363
 #, fuzzy
 msgid "Overwrite"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:381
+#: addressbook/gui/widgets/eab-gui-util.c:399
 #, 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:418
+#: addressbook/gui/widgets/eab-gui-util.c:436
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:551
+#: addressbook/gui/widgets/eab-gui-util.c:569
 #, fuzzy
 msgid "list"
 msgstr "Brétema"
 
-#: addressbook/gui/widgets/eab-gui-util.c:686
+#: addressbook/gui/widgets/eab-gui-util.c:704
 #, fuzzy
 msgid "Move contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:688
+#: addressbook/gui/widgets/eab-gui-util.c:706
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:691
+#: addressbook/gui/widgets/eab-gui-util.c:709
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:693
+#: addressbook/gui/widgets/eab-gui-util.c:711
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:696
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/widgets/eab-gui-util.c:869
+#: addressbook/gui/widgets/eab-gui-util.c:887
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:872
+#: addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -3634,18 +3681,18 @@ msgstr "Contrasinal"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1320
-#: calendar/conduits/todo/todo-conduit.c:857
+#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/todo/todo-conduit.c:849
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1321
-#: calendar/conduits/todo/todo-conduit.c:858
+#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/todo/todo-conduit.c:850
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1436
-#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1422
+#: calendar/conduits/calendar/calendar-conduit.c:1425
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 
@@ -3654,8 +3701,8 @@ 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:945
-#: calendar/conduits/todo/todo-conduit.c:948
+#: calendar/conduits/todo/todo-conduit.c:929
+#: calendar/conduits/todo/todo-conduit.c:932
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
@@ -3665,7 +3712,7 @@ msgid "Calendar and Tasks"
 msgstr "Preferencias da Axenda e as Tarefas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:847
+#: calendar/gui/calendar-component.c:944
 #, fuzzy
 msgid "Calendars"
 msgstr "Axenda"
@@ -3715,10 +3762,10 @@ 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:1155 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:500 calendar/gui/tasks-control.c:516
+#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
 #: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -3737,12 +3784,12 @@ msgstr "Opcións"
 msgid "Ending:"
 msgstr "Í_ndice"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas"
@@ -3766,24 +3813,24 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:872
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:876
+#: calendar/gui/alarm-notify/alarm-queue.c:877
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:941
+#: calendar/gui/alarm-notify/alarm-queue.c:944
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:959
+#: calendar/gui/alarm-notify/alarm-queue.c:964
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3792,12 +3839,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1060
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
+#: calendar/gui/alarm-notify/alarm-queue.c:1064
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3805,7 +3852,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1090
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3816,24 +3863,24 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#: calendar/gui/alarm-notify/alarm-queue.c:1104
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:164
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:167
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:178
 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:114
+#: calendar/gui/alarm-notify/util.c:37
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalización:"
@@ -3971,30 +4018,30 @@ msgstr ""
 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:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:56
 #, fuzzy
 msgid "Location contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1005
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1606
-#: camel/providers/groupwise/camel-gw-listener.c:302
-#: camel/providers/groupwise/camel-gw-listener.c:326
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: camel/providers/groupwise/camel-gw-listener.c:304
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "Axenda"
 
@@ -4016,7 +4063,8 @@ msgid "Purge events older than"
 msgstr "é menor que"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "días"
 
@@ -4026,8 +4074,8 @@ 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:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1590 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4049,90 +4097,93 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-component.c:373
+#: calendar/gui/calendar-component.c:367
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:432
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: calendar/gui/calendar-component.c:423
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:932
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+msgid "Properties..."
+msgstr "Propiedades..."
+
+#: calendar/gui/calendar-component.c:790
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:802
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:836
+msgid ""
+"Selected calendar is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/calendar-component.c:1095
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1096
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:1097
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:1103
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuración da Fonte de Novas"
 
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:1104
 #, fuzzy
 msgid "M_eeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:1105
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:1111
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:1112
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/calendar-component.c:950
+#: calendar/gui/calendar-component.c:1113
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:956
+#: calendar/gui/calendar-component.c:1119
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:957
+#: calendar/gui/calendar-component.c:1120
 #, fuzzy
 msgid "C_alendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-component.c:958
+#: calendar/gui/calendar-component.c:1121
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: calendar/gui/calendar-component.c:1026
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1038
-msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1072
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
@@ -4257,15 +4308,11 @@ msgstr "Amosar un diálogo"
 msgid "extra times every"
 msgstr "veces cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
+#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
-msgid "minutes"
-msgstr "minutos"
-
 #: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
@@ -4308,8 +4355,7 @@ msgstr "Enviar unha mensaxe"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:167
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4339,7 +4385,7 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -4349,36 +4395,36 @@ msgstr "comezo da cita"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:569 mail/em-account-prefs.c:492
-#: mail/em-composer-prefs.c:670 mail/em-composer-prefs.c:898
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
+#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
 msgid "Enabled"
 msgstr "Activado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:731
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
 #, fuzzy
 msgid "Are you sure you want to remove this URL?"
 msgstr "¿Está seguro de que quere borrar o cartafol '%s'?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:739
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
 #, fuzzy
 msgid "Don't Remove"
 msgstr "Non eliminar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:789
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:857 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Disable"
 msgstr "Desactivar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:789
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:859 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Enable"
 msgstr "Activado"
 
@@ -4434,7 +4480,7 @@ msgstr "A_ctivar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "Venres"
 
@@ -4448,7 +4494,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Luns"
 
@@ -4459,7 +4505,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4473,7 +4519,7 @@ msgstr "Amosa-los _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4493,7 +4539,7 @@ msgstr "Lista de _Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -4511,7 +4557,7 @@ msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4521,7 +4567,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -4564,6 +4610,16 @@ msgstr "_Amosar estacións:"
 msgid "_Display"
 msgstr "_Amosar"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 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:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Editar"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Free/Busy Publishing"
@@ -4618,27 +4674,27 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:156
+#: calendar/gui/dialogs/calendar-setup.c:166
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Nome do estilo:"
 
-#: calendar/gui/dialogs/calendar-setup.c:164
+#: calendar/gui/dialogs/calendar-setup.c:174
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:189
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:216
+#: calendar/gui/dialogs/calendar-setup.c:234
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:229
+#: calendar/gui/dialogs/calendar-setup.c:247
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4647,100 +4703,68 @@ msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
 #, fuzzy
-msgid "Calendar Creation Assistant"
-msgstr "Fontes do Libro de Enderezos"
+msgid "Add Calendar"
+msgstr "Engadir á Axenda"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:3
 #, fuzzy
-msgid "Calendar Properties"
-msgstr "Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid ""
-"Congratulations, you are finished setting up this calendar.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid ""
-"Congratulations, you are finished setting up this task list.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
+msgid "Add Tasks Group"
+msgstr "Lista de _Tarefas"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:364
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
 #, fuzzy
-msgid "New Task List"
-msgstr "Lista de _Tarefas"
+msgid "Calendar Properties"
+msgstr "Axenda"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
 #, fuzzy
 msgid "Remote"
 msgstr "Eliminar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid ""
-"Specifying a display name and group is the first step in setting up a "
-"calendar."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:19
-msgid ""
-"Specifying a display name and group is the first step in setting up a task "
-"list."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
-msgid "Step 2: Remote Folder Parameters"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:22
-#, fuzzy
-msgid "Task List Creation Assistant"
-msgstr "Fontes do Libro de Enderezos"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "Task List Properties"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:24
-msgid ""
-"This assistant will help you create a new calendar. \n"
-"\n"
-"Depending on the type of calendar you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:29
-msgid ""
-"This assistant will help you create a new task list.\n"
-"\n"
-"Depending on the type of task list you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Engadir á Axenda"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:35
-msgid ""
-"You're creating a folder in a group that's stored in a remote location. This "
-"requires you\n"
-"to specify additional parameters."
-msgstr ""
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Novo Grupo..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:38
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
 #, fuzzy
 msgid "_Refresh Interval:"
 msgstr "_Actualizar Lista "
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:39
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Actualizar Lista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
 #, fuzzy
 msgid "_Source URL:"
 msgstr "URI da Fonte POP"
 
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "semanas"
+
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4840,52 +4864,52 @@ msgstr " (Pendente "
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:424
+#: calendar/gui/dialogs/comp-editor.c:431
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:899
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:904
+#: calendar/gui/dialogs/comp-editor.c:941
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:909
+#: calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:907
-#: calendar/gui/dialogs/comp-editor.c:944
+#: calendar/gui/dialogs/comp-editor.c:912
+#: calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:910
-#: calendar/gui/dialogs/comp-editor.c:947
+#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:921
-#: calendar/gui/dialogs/comp-editor.c:957
+#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:962
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1193
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
+#: composer/e-msg-composer.c:1183
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1485
-#: calendar/gui/dialogs/comp-editor.c:1509
-#: calendar/gui/dialogs/comp-editor.c:1535
+#: calendar/gui/dialogs/comp-editor.c:1480
+#: calendar/gui/dialogs/comp-editor.c:1515
+#: calendar/gui/dialogs/comp-editor.c:1541
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1574
+#: calendar/gui/dialogs/comp-editor.c:1577
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "¡Non foi posible obter a versión actual!"
@@ -5086,11 +5110,6 @@ msgstr "Oc_upado"
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
-msgid "Calendar:"
-msgstr "Axenda"
-
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Classification"
@@ -5149,33 +5168,44 @@ msgstr "Hora de _comezo:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2168
-#: mail/em-account-prefs.c:453 mail/em-folder-view.c:803
-#: mail/mail-account-gui.c:1390 mail/mail-account-gui.c:1884
+#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
+#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
+#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
 #: mail/mail-config.glade.h:100
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/dialogs/meeting-page.c:418
+#: calendar/gui/dialogs/meeting-page.c:420
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:426
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:439
+#: calendar/gui/dialogs/meeting-page.c:441
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:650
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
+#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Borrar"
+
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -5213,7 +5243,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5412,7 +5442,7 @@ msgid "_No recurrence"
 msgstr "Se_n recorrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:450
 msgid "_Remove"
 msgstr "Elimina_r"
 
@@ -5455,7 +5485,7 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1610
+#: calendar/gui/dialogs/save-comp.c:57
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5515,42 +5545,38 @@ 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:597
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
-#: mail/message-list.c:945
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
 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:595
-#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2343
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
+#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
-#: mail/message-list.c:943
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:232 mail/message-list.c:944
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
+#: mail/message-list.c:922
 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:593
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -5560,7 +5586,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:377
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -5582,10 +5608,6 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Enderezo da páxina _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:193
-msgid "Basic"
-msgstr "Básico"
-
 #: calendar/gui/dialogs/task-editor.c:207
 #: calendar/gui/dialogs/task-editor.c:270
 #: calendar/gui/dialogs/task-editor.c:407
@@ -5596,12 +5618,7 @@ msgstr "Asignación"
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:547 calendar/gui/e-cal-model-tasks.c:738
-#: calendar/gui/e-cal-model-tasks.c:766
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.c:840
+#: calendar/gui/dialogs/task-page.c:824
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non se pode abrir o libro de enderezos"
@@ -5610,8 +5627,8 @@ msgstr "Non se pode abrir o libro de enderezos"
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Descrición:"
@@ -5767,17 +5784,17 @@ msgid "%s for an unknown trigger type"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
 msgid "Public"
 msgstr "Público"
 
 #: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:353
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:354
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -5794,32 +5811,32 @@ msgstr "Data de _Inicio:"
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:545
+#: calendar/gui/e-cal-model-tasks.c:573
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5829,28 +5846,28 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Non"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 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:1674 camel/camel-gpg-context.c:1725
 #: 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:2134
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -5862,134 +5879,134 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:397
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:398
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:399
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:400
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:401
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:402
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:403
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:404
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:405
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:406
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
-#: mail/em-folder-view.c:769 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:1041
+#: calendar/gui/e-calendar-table.c:1023
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
-#: mail/em-folder-view.c:771 mail/em-popup.c:689 mail/em-popup.c:804
+#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
+#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
-#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
-#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
+#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
-#: mail/em-folder-tree.c:2563 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
+#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
-#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
-#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
+#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
+#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1035
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1054
+#: calendar/gui/e-calendar-table.c:1036
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1037
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1038
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.c:1353
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -6000,7 +6017,7 @@ msgid "% Complete"
 msgstr "% Completo"
 
 #: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Completo"
 
@@ -6027,74 +6044,74 @@ msgstr "Data de _Inicio:"
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Seleccionar _Fío"
 
-#: calendar/gui/e-calendar-view.c:1251
+#: calendar/gui/e-calendar-view.c:1265
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Eliminar..."
 
-#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1274
+#: calendar/gui/e-calendar-view.c:1288
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_Copiar a un Cartafol..."
 
-#: calendar/gui/e-calendar-view.c:1275
+#: calendar/gui/e-calendar-view.c:1289
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover ó Cartafol.."
 
-#: calendar/gui/e-calendar-view.c:1276
+#: calendar/gui/e-calendar-view.c:1290
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1291
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-view.c:1316
+#: calendar/gui/e-calendar-view.c:1331
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-calendar-view.c:1318
+#: calendar/gui/e-calendar-view.c:1333
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Preferencias de Correo..."
@@ -6129,134 +6146,134 @@ 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:1573
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1606
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:823 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:826 calendar/gui/e-week-view.c:599
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:591
+#: calendar/gui/e-itip-control.c:592
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recorrencia _simple"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada"
 msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:608
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada"
 msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:610
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
 msgid " and "
 msgstr "Area"
 
-#: calendar/gui/e-itip-control.c:624
+#: calendar/gui/e-itip-control.c:625
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:645
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "Un m_es"
 msgstr[1] "Un m_es"
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:649
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada"
 msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:660
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:669
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:693
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-itip-control.c:722
+#: calendar/gui/e-itip-control.c:723
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrición:</b> %s"
 
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "información de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:788
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente descoñecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:910
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6264,334 +6281,326 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:925
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:930
-#, fuzzy
-msgid "Location:"
-msgstr ""
-"\n"
-"Localización Xeográfica: "
-
-#. write status
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:202
+#: calendar/gui/e-itip-control.c:950
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acción"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1023
 #, fuzzy
 msgid "Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
+#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
 #: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1051
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1052
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1053
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1077
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1103
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1192
 #, 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:1187
+#: calendar/gui/e-itip-control.c:1193
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1200
 #, 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:1195
+#: calendar/gui/e-itip-control.c:1201
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1205
 #, 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:1200
+#: calendar/gui/e-itip-control.c:1206
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1210
 #, 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:1205
+#: calendar/gui/e-itip-control.c:1211
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1218
 #, 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:1213
+#: calendar/gui/e-itip-control.c:1219
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1227
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
+#: calendar/gui/e-itip-control.c:1337
 #, 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:1229
+#: calendar/gui/e-itip-control.c:1235
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1260
 #, 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:1255
+#: calendar/gui/e-itip-control.c:1261
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1268
 #, 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:1263
+#: calendar/gui/e-itip-control.c:1269
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1273
 #, 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:1268
+#: calendar/gui/e-itip-control.c:1274
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1278
 #, 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:1273
+#: calendar/gui/e-itip-control.c:1279
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1286
 #, 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:1281
+#: calendar/gui/e-itip-control.c:1287
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1294
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1295
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1303
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1322
 #, 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:1317
+#: calendar/gui/e-itip-control.c:1323
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1327
 #, 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:1322
+#: calendar/gui/e-itip-control.c:1328
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1332
 #, 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:1327
+#: calendar/gui/e-itip-control.c:1333
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1338
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1413
 #, 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:1466
+#: calendar/gui/e-itip-control.c:1472
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1503
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1527
+#: calendar/gui/e-itip-control.c:1535
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1766
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1768
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
+#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1816
+#: calendar/gui/e-itip-control.c:1824
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1828
+#: calendar/gui/e-itip-control.c:1836
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1855
 #, 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:1850
+#: calendar/gui/e-itip-control.c:1858
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1861
 #, 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:1856
+#: calendar/gui/e-itip-control.c:1864
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1867
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1890
+#: calendar/gui/e-itip-control.c:1898
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
+#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -6791,34 +6800,7 @@ msgstr "Hora do _inicio da reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-tasks.c:180
-#, fuzzy
-msgid "Start Date:"
-msgstr "Data de _Inicio:"
-
-#: calendar/gui/e-tasks.c:196
-#, fuzzy
-msgid "Due Date:"
-msgstr "_Data Límite"
-
-#. write priority
-#: calendar/gui/e-tasks.c:224
-#, fuzzy
-msgid "Priority:"
-msgstr "_Prioridade:"
-
-#. URL
-#: calendar/gui/e-tasks.c:280
-#, fuzzy
-msgid "Web Page:"
-msgstr "Páxina"
-
-#: calendar/gui/e-tasks.c:313 mail/em-folder-view.c:2213
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Prema para engadir unha tarefa"
-
-#: calendar/gui/e-tasks.c:789 calendar/gui/gnome-cal.c:1909
+#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6826,7 +6808,7 @@ msgid ""
 msgstr "Erro ao iniciar %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:808
+#: calendar/gui/e-tasks.c:544
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6834,64 +6816,64 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:624
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:909
+#: calendar/gui/e-tasks.c:645
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:928
+#: calendar/gui/e-tasks.c:664
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:1030
+#: calendar/gui/e-tasks.c:766
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:1053
+#: calendar/gui/e-tasks.c:789
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:1079
+#: calendar/gui/e-tasks.c:816
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/gnome-cal.c:1770
+#: calendar/gui/gnome-cal.c:1773
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Non hai citas"
 
-#: calendar/gui/gnome-cal.c:1789
+#: calendar/gui/gnome-cal.c:1792
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1812
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1941
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1950
+#: calendar/gui/gnome-cal.c:1953
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2763
+#: calendar/gui/gnome-cal.c:2757
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
@@ -7016,7 +6998,7 @@ msgstr "información de axenda"
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/migration.c:137
+#: calendar/gui/migration.c:146
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7024,7 +7006,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:141
+#: calendar/gui/migration.c:150
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7032,12 +7014,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:366
+#: calendar/gui/migration.c:376
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr ""
 
@@ -7276,48 +7258,59 @@ msgstr "Imprimir Elemento"
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:299
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:570
+#: calendar/gui/tasks-component.c:357
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/tasks-component.c:464
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:476
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:514
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:722
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:571
+#: calendar/gui/tasks-component.c:723
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:572
+#: calendar/gui/tasks-component.c:724
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:578
+#: calendar/gui/tasks-component.c:730
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:579
+#: calendar/gui/tasks-component.c:731
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:580
+#: calendar/gui/tasks-component.c:732
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:648
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:660
-msgid "There is no calendar available for creating tasks"
-msgstr ""
-
 #: calendar/gui/tasks-control.c:152
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
@@ -7382,17 +7375,17 @@ msgstr ""
 msgid "Appointments and Meetings"
 msgstr "Cartafol que contén citas e eventos"
 
-#: calendar/importers/icalendar-importer.c:494
+#: calendar/importers/icalendar-importer.c:490
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:702
+#: calendar/importers/icalendar-importer.c:698
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:723
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7401,7 +7394,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:730
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
@@ -9108,16 +9101,16 @@ msgstr "Volvendo a sincronizar co servidor"
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 
-#: camel/camel-disco-folder.c:101
+#: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:441
+#: camel/camel-disco-folder.c:449
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Creando o cartafol %s"
 
-#: camel/camel-disco-store.c:377
+#: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operación"
 
@@ -9298,8 +9291,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
 #: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:697
-#: mail/mail-send-recv.c:598
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
@@ -9826,6 +9819,82 @@ msgstr ""
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduza o seu contrasinal %s para %s"
 
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "Non se puido atopa-lo certificado de \"%s\"."
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "Non se pode abrir a mensaxe"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr "O certificado de cifrado de \"%s\" non existe."
+
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+#, fuzzy
+msgid "Cannot add add encryption certificate"
+msgstr "ID do certificado:"
+
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:430
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "Non foi posible crear un contexto de descodificación S/MIME."
+
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
+
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#, fuzzy
+msgid "Failed to encode data"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
 #: camel/camel-smime-context.c:514
 #, fuzzy
 msgid "Unverified"
@@ -9860,7 +9929,7 @@ msgid "Signature algorithm unknown"
 msgstr ""
 
 #: camel/camel-smime-context.c:528
-msgid "Siganture algorithm unsupported"
+msgid "Signature algorithm unsupported"
 msgstr ""
 
 #: camel/camel-smime-context.c:530
@@ -9873,11 +9942,123 @@ msgstr "Gravar sinatura"
 msgid "Processing error"
 msgstr "Outro erro"
 
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "Engadir criterio"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/camel-smime-context.c:614
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "Ficheiro de sinatura:"
+
+#: camel/camel-smime-context.c:624
+msgid "Certficate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:627
+msgid "Certficate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "Engadir criterio"
+
 #: camel/camel-smime-context.c:647
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tipo de Servidor: "
 
+#: camel/camel-smime-context.c:748
+#, fuzzy
+msgid "Decoder failed"
+msgstr "O comando IMAP fallou: %s"
+
+#: camel/camel-smime-context.c:800
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "Non se puido atopa-lo certificado de \"%s\"."
+
+#: camel/camel-smime-context.c:807
+#, fuzzy
+msgid "Can't find common bulk encryption algorithm"
+msgstr "Non se puido atopar un algoritmo bulk común."
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:816
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:827
+#, fuzzy
+msgid "Can't create CMS Message"
+msgstr "Crear Reg_ra Dende Mensaxe"
+
+#: camel/camel-smime-context.c:833
+msgid "Can't create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:839
+msgid "Can't attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:845
+msgid "Can't attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:854
+msgid "Can't create CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:859
+msgid "Can't add CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:873
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "Non foi posible crear un contexto de descodificación S/MIME."
+
+#: camel/camel-smime-context.c:884
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "Non se puido enviar o nome de usuario ao servidor"
+
+#: camel/camel-smime-context.c:970
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:977
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1004
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "Comando non implementado"
+
+#: camel/camel-smime-context.c:1012
+msgid "export keys: unimplemented"
+msgstr ""
+
 #: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
@@ -10214,8 +10395,8 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/groupwise/camel-gw-listener.c:303
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: camel/providers/groupwise/camel-gw-listener.c:305
+#: camel/providers/groupwise/camel-gw-listener.c:328
 #, fuzzy
 msgid "Checklist"
 msgstr "Brétema espesa"
@@ -10233,6 +10414,13 @@ msgstr "Operación cancelada"
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10265,31 +10453,31 @@ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:323
+#: camel/providers/imap/camel-imap-folder.c:326
 msgid "Folder was destroyed and recreated on server."
 msgstr "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:566
+#: camel/providers/imap/camel-imap-folder.c:569
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1960
+#: camel/providers/imap/camel-imap-folder.c:1963
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10305,25 +10493,25 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: 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"
 
-#: camel/providers/imap/camel-imap-folder.c:2041
-#: camel/providers/imap/camel-imap-folder.c:2643
-#: camel/providers/nntp/camel-nntp-folder.c:205
+#: camel/providers/imap/camel-imap-folder.c:2044
+#: camel/providers/imap/camel-imap-folder.c:2646
+#: camel/providers/nntp/camel-nntp-folder.c:233
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:2307
-#: camel/providers/imap/camel-imap-folder.c:2377
+#: camel/providers/imap/camel-imap-folder.c:2310
+#: camel/providers/imap/camel-imap-folder.c:2380
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo información de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2681
+#: camel/providers/imap/camel-imap-folder.c:2684
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -10930,7 +11118,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:592 mail/em-folder-tree.c:2523
+#: camel/providers/local/camel-mbox-summary.c:592
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -11097,8 +11285,8 @@ msgstr "Non se puido enviar o nome de usuario ao servidor"
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
-#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/nntp/camel-nntp-folder.c:168
+#: camel/providers/nntp/camel-nntp-folder.c:258
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -11107,9 +11295,9 @@ msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 msgid "User cancelled"
 msgstr "Operación cancelada"
 
-#: camel/providers/nntp/camel-nntp-folder.c:142
-#: camel/providers/nntp/camel-nntp-folder.c:226
-#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:254
+#: camel/providers/nntp/camel-nntp-folder.c:260
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11120,49 +11308,49 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:195
+#: camel/providers/nntp/camel-nntp-folder.c:185
+#: camel/providers/nntp/camel-nntp-folder.c:223
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:198
 #, fuzzy, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Non foi posible recibir a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-folder.c:353
+#: camel/providers/nntp/camel-nntp-folder.c:381
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:364
+#: camel/providers/nntp/camel-nntp-folder.c:392
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
-#: camel/providers/nntp/camel-nntp-folder.c:417
+#: camel/providers/nntp/camel-nntp-folder.c:432
+#: camel/providers/nntp/camel-nntp-folder.c:445
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:429
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "Error reading response to posted message: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:432
+#: camel/providers/nntp/camel-nntp-folder.c:460
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:448
+#: camel/providers/nntp/camel-nntp-folder.c:476
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/nntp/camel-nntp-folder.c:459
+#: camel/providers/nntp/camel-nntp-folder.c:487
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
@@ -11335,7 +11523,8 @@ msgstr "Non existe a mensaxe con UID %s"
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
+#: composer/e-msg-composer.c:1236
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitación descoñecida"
@@ -11790,34 +11979,34 @@ msgstr "O comando IMAP fallou: %s"
 msgid "QUIT command failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:112
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1486
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:453
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "Remove selected items from the attachment list"
 msgstr "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:491
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:494
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro á mensaxe"
 
@@ -11846,17 +12035,10 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:66
+#: composer/e-msg-composer-select-file.c:74
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:308
-#, 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:512
 #, fuzzy
 msgid "Posting destination"
@@ -11937,162 +12119,78 @@ msgstr "_Porto:"
 msgid "Click here to select folders to post to"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: composer/e-msg-composer-select-file.c:119
+#: composer/e-msg-composer-select-file.c:127
 #, fuzzy
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:701
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: composer/e-msg-composer.c:831
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"Erro ao le-lo ficheiro %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:1208
-msgid "File exists, overwrite?"
-msgstr "O ficheiro existe, ¿sobrescribir?"
-
-#: composer/e-msg-composer.c:1219 composer/e-msg-composer.c:1235
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erro ao gardar o ficheiro: %s"
-
-#: composer/e-msg-composer.c:1259
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erro ao cargar o ficheiro: %s"
-
-#: composer/e-msg-composer.c:1297
-#, c-format
-msgid "Error accessing file: %s"
-msgstr "Erro ao acceder ao ficheiro: %s"
+#: composer/e-msg-composer.c:1273
+#, fuzzy
+msgid "Could not open file"
+msgstr "Non se pode abrir a mensaxe"
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1281
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1312
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
-msgstr ""
-"Non é posible desprazarse no ficheiro: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1319
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
-msgstr ""
-"Non foi posible trunca-lo ficheiro: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1328
-#, fuzzy, c-format
-msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
-msgstr ""
-"Non é posible desprazarse no ficheiro: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1337
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
-msgstr ""
-"Erro ao autogardar a mensaxe: %s:\n"
-" %s"
-
-#: composer/e-msg-composer.c:1441
-#, fuzzy
-msgid ""
-"Ximian Evolution has found unsaved messages from a previous session.\n"
-"Would you like to try to recover them?"
-msgstr ""
-"Evolution atopou ficheiros non gravados dunha sesión anterior.\n"
-"¿Gostaríalle probar a recuperalos?"
-
-#: composer/e-msg-composer.c:1605
-#, fuzzy, c-format
-msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta mensaxe non foi enviada.\n"
-"\n"
-"¿Desexa gardar os cambios?"
-
-#: composer/e-msg-composer.c:1607
+#: composer/e-msg-composer.c:1551
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Mensaxe Sen Título)"
 
-#: composer/e-msg-composer.c:1614
-#, fuzzy
-msgid "Warning: Modified Message"
-msgstr "Mensaxe Remitida"
-
-#: composer/e-msg-composer.c:1647
+#: composer/e-msg-composer.c:1581
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2054 mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2153
+#: composer/e-msg-composer.c:2087
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: composer/e-msg-composer.c:2353
+#: composer/e-msg-composer.c:2288
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2382
+#: composer/e-msg-composer.c:2317
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2385 composer/e-msg-composer.c:3284
+#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2402 composer/e-msg-composer.c:3167
-#: composer/e-msg-composer.c:3168
+#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
+#: composer/e-msg-composer.c:3104
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:3197
+#: composer/e-msg-composer.c:3137
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3225
+#: composer/e-msg-composer.c:3165
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -12103,7 +12201,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:3329
+#: composer/e-msg-composer.c:3269
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -12112,12 +12210,134 @@ 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:4334
+#: composer/e-msg-composer.c:4274
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/mail-composer-errors.xml.in.h:1
+msgid "${1}"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:2
+#, fuzzy
+msgid "All accounts have been removed."
+msgstr "Cada conta ten que ter un nome diferente."
+
+#: composer/mail-composer-errors.xml.in.h:3
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "¿Está seguro de que quere borrar esta cita sen título?"
+
+#: composer/mail-composer-errors.xml.in.h:4
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:5
+msgid "Because \"${1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:7
+#, fuzzy
+msgid "Could not create message."
+msgstr "Non foi posible crear unha canalización: %s"
+
+#: composer/mail-composer-errors.xml.in.h:8
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
+
+#: composer/mail-composer-errors.xml.in.h:9
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
+
+#: composer/mail-composer-errors.xml.in.h:10
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:11
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Imprimir tarxeta"
+
+#: composer/mail-composer-errors.xml.in.h:12
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "¿Quere gardar os cambios?"
+
+#: composer/mail-composer-errors.xml.in.h:13
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Non eliminar"
+
+#: composer/mail-composer-errors.xml.in.h:14
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Erro ao gardar os atallos."
+
+#: composer/mail-composer-errors.xml.in.h:15
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:16
+#, fuzzy
+msgid "Recover"
+msgstr "Eliminar"
+
+#: composer/mail-composer-errors.xml.in.h:17
+#, fuzzy
+msgid "Save Message"
+msgstr "Gardar Mensaxe Como..."
+
+#: composer/mail-composer-errors.xml.in.h:18
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:19
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:20
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Seguinte Mensaxe Sen Ler"
+
+#: composer/mail-composer-errors.xml.in.h:21
+#, fuzzy
+msgid "Warning: Modified Message"
+msgstr "Mensaxe Remitida"
+
+#: composer/mail-composer-errors.xml.in.h:22
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Anexar un ficheiro á mensaxe"
+
+#: composer/mail-composer-errors.xml.in.h:23
+#, 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."
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12407,26 +12627,21 @@ msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: filter/filter-datespec.c:187
-#, fuzzy
-msgid "You must choose a date."
-msgstr "Oops. Esqueceu escoller unha data."
-
-#: filter/filter-datespec.c:287
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:297
+#: filter/filter-datespec.c:290
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:413
+#: filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Seleccionar un Fuso Horario"
@@ -12436,17 +12651,88 @@ msgstr "Seleccionar un Fuso Horario"
 msgid "_Filter Rules"
 msgstr "Regras de Filtrado"
 
-#: filter/filter-file.c:166
+#: filter/filter-errors.xml.in.h:1
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
+
+#: filter/filter-errors.xml.in.h:2
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:3
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+
+#: filter/filter-errors.xml.in.h:4
+#, fuzzy
+msgid "Missing date."
+msgstr "Actualización da Xuntanza"
+
+#: filter/filter-errors.xml.in.h:5
+#, fuzzy
+msgid "Missing file name."
+msgstr "_Nome da lista:"
+
+#: filter/filter-errors.xml.in.h:6
+#, fuzzy
+msgid "Missing folder."
+msgstr "Resumindo cartafol"
+
+#: filter/filter-errors.xml.in.h:7
+#, fuzzy
+msgid "Missing name."
+msgstr "Asignación"
+
+#: filter/filter-errors.xml.in.h:8
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:9
+#, fuzzy
+msgid "No sources selected."
+msgstr "Non se seleccionou ningún servidor"
+
+#: filter/filter-errors.xml.in.h:10
+msgid "Please choose another name."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:11
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Oops. Esqueceu escoller unha data."
+
+#: filter/filter-errors.xml.in.h:12
+#, fuzzy
+msgid "You must name this filter."
+msgstr "Cambiar o nome deste cartafol"
+
+#: filter/filter-errors.xml.in.h:13
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Cambiar o nome deste cartafol"
+
+#: filter/filter-errors.xml.in.h:14
 #, fuzzy
 msgid "You must specify a file name."
 msgstr "Nome do estilo:"
 
-#: filter/filter-file.c:185
-#, fuzzy, c-format
-msgid "File '%s' does not exist or is not a regular file."
-msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+#: filter/filter-errors.xml.in.h:15
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "Nome do estilo:"
 
-#: filter/filter-file.c:301
+#: filter/filter-errors.xml.in.h:16
+msgid ""
+"You must specify at least one folder as a source. Either by selecting the "
+"folders individually, and/or by selecting all local folders, all remote "
+"folders, or both."
+msgstr ""
+
+#: filter/filter-file.c:288
 #, fuzzy
 msgid "Choose a file"
 msgstr "Escolla unha Acción"
@@ -12457,39 +12743,25 @@ msgstr "Escolla unha Acción"
 msgid "<b>Then</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: filter/filter-folder.c:153
-#, fuzzy
-msgid "You must specify a folder."
-msgstr "Nome do estilo:"
-
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1177
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: mail/mail-account-gui.c:1327
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Erro na expresión regular '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:924
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
 #: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:927 mail/mail-config.c:68
+#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
 #: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:928 mail/mail-config.c:69
+#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Later"
@@ -12499,43 +12771,38 @@ msgstr "despois"
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:219
-#, fuzzy
-msgid "You must name this filter."
-msgstr "Cambiar o nome deste cartafol"
-
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:746
 #, fuzzy
 msgid "Rule name:"
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:756
+#: filter/filter-rule.c:750
 msgid "Untitled"
 msgstr "Sen título"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:773
 #, fuzzy
 msgid "<b>If</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: filter/filter-rule.c:810
+#: filter/filter-rule.c:804
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:814
+#: filter/filter-rule.c:808
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:813
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "outgoing"
 msgstr "saínte"
 
@@ -12618,10 +12885,6 @@ msgstr "a hora actual"
 msgid "the time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
-
 #: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "con todos os cartafoles remotos activos"
@@ -12775,7 +13038,7 @@ msgstr "Marcada"
 msgid "Junk Test"
 msgstr "xuño"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:802
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12889,9 +13152,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1539
-#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
+#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Asunto"
@@ -12901,21 +13164,15 @@ msgstr "Asunto"
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1008
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr ""
-
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:375
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
-#: filter/rule-editor.c:699
+#: filter/rule-editor.c:685
 #, fuzzy
 msgid "Rule name"
 msgstr "Nome da regra: "
@@ -12962,17 +13219,7 @@ msgstr "O asunto non contén"
 msgid "Virtual _Folders"
 msgstr "Cartafoles Virtuais"
 
-#: filter/vfolder-rule.c:215
-#, fuzzy
-msgid "You must name this vfolder."
-msgstr "Cambiar o nome deste cartafol"
-
-#: filter/vfolder-rule.c:230
-#, 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:587
+#: filter/vfolder-rule.c:572
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
@@ -13031,10 +13278,10 @@ msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
 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:828
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:495
-#: mail/mail-component.c:540
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
+#: mail/mail-component.c:582
 msgid "Mail"
 msgstr "Correo"
 
@@ -13048,107 +13295,44 @@ msgstr "Contas"
 msgid "Mail Preferences"
 msgstr "Preferencias da Axenda"
 
-#: mail/em-account-prefs.c:232
-msgid "Are you sure you want to delete this account?"
-msgstr "¿Está seguro de que quere borrar esta conta?"
-
-#: mail/em-account-prefs.c:240
-msgid "Don't delete"
-msgstr "Non borrar"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:444
+#: mail/em-account-prefs.c:415
 #, fuzzy
 msgid "[Default]"
 msgstr "Por de_fecto"
 
-#: mail/em-account-prefs.c:498
+#: mail/em-account-prefs.c:469
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da Cont_a:"
 
-#: mail/em-account-prefs.c:500
+#: mail/em-account-prefs.c:471
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/em-composer-prefs.c:295 mail/em-composer-prefs.c:418
-#: mail/mail-config.c:1037
+#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
+#: mail/mail-config.c:1038
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
 
-#: mail/em-composer-prefs.c:402
-#, fuzzy
-msgid "You must specify a valid script name."
-msgstr "Nome do estilo:"
-
-#: mail/em-composer-prefs.c:902
+#: mail/em-composer-prefs.c:895
 #, fuzzy
 msgid "Language(s)"
 msgstr "Idioma"
 
-#: mail/em-composer-prefs.c:948
+#: mail/em-composer-prefs.c:941
 #, fuzzy
 msgid "Add signature script"
 msgstr "Borrar todo agás a sinatura"
 
-#: mail/em-composer-prefs.c:968
+#: mail/em-composer-prefs.c:961
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
 
-#: mail/em-composer-utils.c:124
-#, 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:138
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Esta mensaxe non ten asunto.\n"
-"¿Enviar realmente?"
-
-#: 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."
-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:157
-msgid "This message contains only Bcc recipients."
-msgstr "Esta mensaxe só contén destinatarios Bcc."
-
-#: 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"
-"Send anyway?"
-msgstr ""
-"É posible que o servidor de correo revele os destinatarios engadindo unha "
-"cabeceira Apparently-To.\n"
-"¿Enviar de todas maneiras?"
-
-#: mail/em-composer-utils.c:305
-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:574
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"¿Gostaríalle usar o cartafol de borradores por defecto?"
-
-#: mail/em-folder-browser.c:138
+#: mail/em-folder-browser.c:139
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
@@ -13188,8 +13372,8 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2277
-#: mail/mail-component.c:704
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
+#: mail/mail-component.c:731
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
@@ -13199,326 +13383,290 @@ msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:856
+#: mail/mail-vfolder.c:852
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
+#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
 msgid "Inbox"
 msgstr "Entrada"
 
-#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802
+#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
-#: mail/em-folder-tree.c:922
+#: mail/em-folder-tree.c:924
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:926
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/em-folder-tree.c:931
+#: mail/em-folder-tree.c:933
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:935
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/em-folder-tree.c:949
+#: mail/em-folder-tree.c:951
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:1997
-#, fuzzy, c-format
-msgid "Cannot move folder `%s': illegal operation"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#: mail/em-folder-tree.c:2026 mail/em-folder-tree.c:2203
-#, fuzzy, c-format
-msgid "%s"
-msgstr "s"
-
-#: mail/em-folder-tree.c:2042 mail/em-folder-tree.c:2055
-#: mail/em-folder-view.c:671 mail/em-folder-view.c:685
+#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
+#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:2082
+#: mail/em-folder-tree.c:2080
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/em-folder-tree.c:2277 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:2396
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Non foi posible borrar o cartafol `%s': %s"
-
-#: mail/em-folder-tree.c:2423
-#, fuzzy, c-format
-msgid "Cannot delete local %s folder."
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: mail/em-folder-tree.c:2429
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Elimina-lo cartafol '%s'"
-
-#: mail/em-folder-tree.c:2439
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Eliminar"
-
-#: mail/em-folder-tree.c:2475
-#, fuzzy, c-format
-msgid "Cannot rename local %s folder."
-msgstr "Non foi posible renomear o cartafol %s a %s: %s"
-
-#: mail/em-folder-tree.c:2484
+#: mail/em-folder-tree.c:2458
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2486
+#: mail/em-folder-tree.c:2460
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2510
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: mail/em-folder-tree.c:2558 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Vista"
 
-#: mail/em-folder-tree.c:2559
+#: mail/em-folder-tree.c:2530
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: mail/em-folder-tree.c:2564
+#: mail/em-folder-tree.c:2535
 #, fuzzy
 msgid "_Move"
 msgstr "Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2568
+#: mail/em-folder-tree.c:2539
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2571
+#: mail/em-folder-tree.c:2542
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2574 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2545 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:770 mail/em-popup.c:688
+#: mail/em-folder-view.c:771 mail/em-popup.c:689
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:772
+#: mail/em-folder-view.c:773
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:775 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:776 mail/em-popup.c:808
+#: mail/em-folder-view.c:777 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:778 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:811
+#: mail/em-folder-view.c:779 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:781
+#: mail/em-folder-view.c:782
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:783
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:784
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:786 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:787
+#: mail/em-folder-view.c:788
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:789
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:790
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:790 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:796
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:799
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:799 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:808
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:810
+#: mail/em-folder-view.c:811
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:812
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Regras de Filtrado"
 
-#: mail/em-folder-view.c:814
+#: mail/em-folder-view.c:815
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:816
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:817
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:818
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:819
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:820
+#: mail/em-folder-view.c:821
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:824
+#: mail/em-folder-view.c:825
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:826
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:827
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:828
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:829
+#: mail/em-folder-view.c:830
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar polo Au_tor"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1612 mail/em-folder-view.c:1650
+#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
 #: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1686
+#: mail/em-folder-view.c:1687
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1949
+#: mail/em-folder-view.c:1950
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/em-folder-view.c:2208
+#: mail/em-folder-view.c:2209
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Prema para engadir unha tarefa"
 
+#: mail/em-folder-view.c:2214
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Prema para engadir unha tarefa"
+
 #. message-search popup match count string
-#: mail/em-format-html-display.c:409
+#: mail/em-format-html-display.c:410
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Aparicións:"
 
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 #, fuzzy
 msgid "Unsigned"
 msgstr "Asignada"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13527,12 +13675,12 @@ msgstr ""
 "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
 "autenticidade"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 #, fuzzy
 msgid "Valid signature"
 msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13541,104 +13689,104 @@ msgstr ""
 "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
 "autenticidade"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:648
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:649
 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:654 mail/em-format-html.c:577
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Indefinida"
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
+"The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:656
 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:656 mail/em-format-html.c:579
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 #, fuzzy
 msgid "Encrypted"
 msgstr "Cifrar con PGP"
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:657
 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:657 mail/em-format-html.c:580
+#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:658
 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:754
+#: mail/em-format-html-display.c:755
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID do certificado:"
 
-#: mail/em-format-html-display.c:769
+#: mail/em-format-html-display.c:770
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: mail/em-format-html-display.c:1001
+#: mail/em-format-html-display.c:1002
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html-display.c:1009
+#: mail/em-format-html-display.c:1010
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1013
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html-display.c:1082
+#: mail/em-format-html-display.c:1083
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Inline"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1084
 #, fuzzy
 msgid "_Hide"
 msgstr "Agochar"
@@ -13648,74 +13796,74 @@ msgstr "Agochar"
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/em-format-html.c:461 mail/em-format-html.c:463
+#: mail/em-format-html.c:462 mail/em-format-html.c:464
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/em-format-html.c:840
+#: mail/em-format-html.c:843
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/em-format-html.c:870
+#: mail/em-format-html.c:873
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/em-format-html.c:881
+#: mail/em-format-html.c:884
 #, 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:883
+#: mail/em-format-html.c:886
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/em-format-html.c:904
+#: mail/em-format-html.c:907
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/em-format-html.c:915
+#: mail/em-format-html.c:918
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:1157
+#: mail/em-format-html.c:1160
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:304
+#: mail/message-tag-followup.c:314
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:747
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:71
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
 #. pseudo-header
-#: mail/em-format-html.c:1543 mail/em-format-quote.c:308
+#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
 #: mail/em-mailer-prefs.c:918
 #, fuzzy
 msgid "Mailer"
@@ -13724,68 +13872,57 @@ msgstr ""
 "Cliente de Correo: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1570
+#: mail/em-format-html.c:1573
 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:1573
+#: mail/em-format-html.c:1576
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1583 mail/em-format-quote.c:315 mail/em-format.c:749
+#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format-html.c:1604 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format.c:987
+#: mail/em-format.c:986
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/em-format.c:1066 mail/em-format.c:1188
+#: mail/em-format.c:1065 mail/em-format.c:1184
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
-#: mail/em-format.c:1223
-#, c-format
-msgid "Internal error: expecting CamelMultipart, got \"%s\""
-msgstr ""
-
-#: mail/em-format.c:1178
+#: mail/em-format.c:1174
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1325
+#: mail/em-format.c:1320
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format.c:1344
+#: mail/em-format.c:1339
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "O usuario cancelou a operación."
 
-#: mail/em-format.c:1352
+#: mail/em-format.c:1347
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format.c:1352
+#: mail/em-format.c:1347
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format.c:1372
-#, c-format
-msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
-msgstr ""
-
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
@@ -13810,7 +13947,7 @@ msgstr "Unha sema_na"
 msgid "Once per month"
 msgstr "Un m_es"
 
-#: mail/em-migrate.c:1080
+#: mail/em-migrate.c:1078
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13818,61 +13955,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1935 mail/em-migrate.c:1950
+#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2038 mail/em-migrate.c:2139
+#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2263 mail/em-migrate.c:2435
+#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2275
+#: mail/em-migrate.c:2350
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-popup.c:698
+#: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: mail/em-popup.c:716
+#: mail/em-popup.c:717
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mensaxes Sen Título"
 
-#: mail/em-popup.c:805
+#: mail/em-popup.c:806
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:855
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:963
+#: mail/em-popup.c:964
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -13900,114 +14037,51 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/em-utils.c:100
+#: mail/em-utils.c:95
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: mail/em-utils.c:282
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Erro ao cargar a información do filtro:\n"
-"%s"
-
-#: mail/em-utils.c:291
+#: mail/em-utils.c:285
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:536
+#: mail/em-utils.c:530
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-utils.c:1143
+#: mail/em-utils.c:1137
 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:1153
+#: mail/em-utils.c:1147
 #, 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:1436 mail/em-utils.c:1520 mail/em-utils.c:1529
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Non é posible obter a mensaxe: %s\n"
-"  %s"
-
-#: mail/em-utils.c:1441
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s xa existe\n"
-"¿Quere sobrescribilo?"
-
-#: mail/em-utils.c:1484
+#: mail/em-utils.c:1476
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1536
-#, fuzzy, c-format
-msgid "Error: '%s' exists and is not a regular file"
-msgstr "O spool `%s' non existe ou non é un ficheiro normal"
-
-#: mail/em-utils.c:1590
+#: mail/em-utils.c:1579
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1639
+#: mail/em-utils.c:1628
 #, fuzzy
 msgid "Add address"
 msgstr "_Enderezo:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2074
+#: mail/em-utils.c:2063
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/em-utils.c:2125
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
-
-#: mail/em-utils.c:2456
-#, 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:2481
-#, fuzzy
-msgid ""
-"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 ""
-"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/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14635,21 +14709,21 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#: mail/importers/netscape-importer.c:1678
+#: mail/importers/netscape-importer.c:1677
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Importando Datos"
 
-#: mail/importers/netscape-importer.c:1878
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Opcións"
 
-#: mail/importers/netscape-importer.c:1883
+#: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: mail/importers/netscape-importer.c:1904
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14684,32 +14758,24 @@ msgstr ""
 msgid "Pine"
 msgstr "Imprimir"
 
-#: mail/mail-account-editor.c:110
-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:153
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-account-gui.c:2119
-msgid "You may not create two accounts with the same name."
-msgstr "Non pode crear dúas contas co mesmo nome"
-
 #: mail/mail-autofilter.c:75
 #, fuzzy, c-format
 msgid "Mail to %s"
@@ -14739,95 +14805,84 @@ msgstr "Respondido a"
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-autofilter.c:430
-msgid "The following filter rule(s):\n"
-msgstr ""
-
-#: mail/mail-autofilter.c:436
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-component.c:472
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d seleccionada(s)"
 
-#: mail/mail-component.c:474
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:477
+#: mail/mail-component.c:517
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Borrador"
 
-#: mail/mail-component.c:479
+#: mail/mail-component.c:519
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:481
+#: mail/mail-component.c:521
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:485
+#: mail/mail-component.c:525
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:527
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:583
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+#: mail/mail-component.c:531
+#, fuzzy, c-format
+msgid ", %d selected"
+msgstr "%d seleccionada(s)"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:683
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:684
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:685
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:691
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Novo CartafolV"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:692
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editar Filtros"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:693
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crear unha nova mensaxe"
 
-#: mail/mail-component.c:824
+#: mail/mail-component.c:871
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config-druid.c:368
+#: mail/mail-config-druid.c:366
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14838,13 +14893,13 @@ msgstr ""
 "de embaixo non precisan que se enchan,\n"
 "a menos que queira incluír esta información no correo que envíe."
 
-#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config-druid.c:376
+#: mail/mail-config-druid.c:374
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14854,16 +14909,16 @@ msgstr ""
 "non está seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:383
+#: mail/mail-config-druid.c:381
 msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opcións"
 
-#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config-druid.c:388
+#: mail/mail-config-druid.c:386
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14873,11 +14928,11 @@ msgstr ""
 "está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Xestión de Contas"
 
-#: mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:393
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14894,11 +14949,11 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.c:887
+#: mail/mail-config.c:888
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:965 mail/mail-config.c:969
+#: mail/mail-config.c:966 mail/mail-config.c:970
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -15296,10 +15351,6 @@ msgstr "Organi_zación:"
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
 #: mail/mail-config.glade.h:108
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
@@ -15526,10 +15577,6 @@ msgstr "Facer esta a miña conta por _defecto"
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:170
-msgid "_Name:"
-msgstr "_Nome:"
-
 #: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Never load images from the Internet"
@@ -15578,30 +15625,437 @@ msgstr " cor"
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-folder-cache.c:786
-#, fuzzy, c-format
-msgid "Pinging %s"
-msgstr "Examinando %s"
+#: mail/mail-errors.xml.in.h:1
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
 
-#: mail/mail-mt.c:261
-#, c-format
+#: mail/mail-errors.xml.in.h:2
 msgid ""
-"Error while '%s':\n"
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:3
+msgid "Are you sure you want to delete this account?"
+msgstr "¿Está seguro de que quere borrar esta conta?"
+
+#: mail/mail-errors.xml.in.h:4
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
+"¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
+
+#: mail/mail-errors.xml.in.h:5
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
+
+#: mail/mail-errors.xml.in.h:6
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
+
+#: mail/mail-errors.xml.in.h:7
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
+
+#: mail/mail-errors.xml.in.h:8
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
+
+#: mail/mail-errors.xml.in.h:9
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:10
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:11
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:12
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:13
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: mail/mail-errors.xml.in.h:14
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: mail/mail-errors.xml.in.h:15
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/mail-errors.xml.in.h:16
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"Non se pode crear o directorio\n"
+"%s\n"
+"Erro: %s"
+
+#: mail/mail-errors.xml.in.h:17
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
 "%s"
+
+#: mail/mail-errors.xml.in.h:18
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
-"Erro durante '%s':\n"
+"Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-mt.c:264
-#, c-format
+#: mail/mail-errors.xml.in.h:19
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "O cartafol `%s' non existe."
+
+#: mail/mail-errors.xml.in.h:20
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:21
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: mail/mail-errors.xml.in.h:22
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: mail/mail-errors.xml.in.h:23
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Non se pode abrir a mensaxe"
+
+#: mail/mail-errors.xml.in.h:24
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:25
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Non foi posible renomear o cartafol %s a %s: %s"
+
+#: mail/mail-errors.xml.in.h:26
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:27
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: mail/mail-errors.xml.in.h:28
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
+#: mail/mail-errors.xml.in.h:29
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Borrar todo agás a sinatura"
+
+#: mail/mail-errors.xml.in.h:30
 msgid ""
-"Error while performing operation:\n"
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:31
+#, fuzzy
+msgid "Could not save signature file."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
+
+#: mail/mail-errors.xml.in.h:32
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Eliminar"
+
+#: mail/mail-errors.xml.in.h:33
+#, fuzzy
+msgid "Delete account?"
+msgstr "¿Borrar esta conta de verdade?"
+
+#: mail/mail-errors.xml.in.h:34
+msgid "Discard changed?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:35
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "¿Quere gardar os cambios?"
+
+#: mail/mail-errors.xml.in.h:36
+msgid "Don't delete"
+msgstr "Non borrar"
+
+#: mail/mail-errors.xml.in.h:37
+#, fuzzy
+msgid "Enter password."
+msgstr "Contrasinal"
+
+#: mail/mail-errors.xml.in.h:38
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr ""
+"Erro ao cargar a información do filtro:\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:39
+#, fuzzy
+msgid "Error while performing operation."
 msgstr ""
 "Erro ao efectuar a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-errors.xml.in.h:40
+#, fuzzy
+msgid "Error while {0}."
+msgstr ""
+"Erro durante '%s':\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:41
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "O ficheiro existe, ¿sobrescribir?"
+
+#: mail/mail-errors.xml.in.h:42
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+
+#: mail/mail-errors.xml.in.h:43
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:44
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:45
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:46
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:47
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autenticación"
+
+#: mail/mail-errors.xml.in.h:48
+#, fuzzy
+msgid "Mail filters automatically updated."
+msgstr "Actualizar automaticamente"
+
+#: mail/mail-errors.xml.in.h:49
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:50
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:51
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:52
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Elimina-lo cartafol '%s'"
+
+#: mail/mail-errors.xml.in.h:53
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:54
+msgid ""
+"The contact list you are sending to is configured to hide list recipients. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:55
+msgid ""
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:56
+msgid ""
+"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
+"been updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:57
+msgid ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:58
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:59
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:60
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:61
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requirida"
+
+#: mail/mail-errors.xml.in.h:62
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Esta sinatura cambiou, pero non se gravou.\n"
+"\n"
+"¿Desexa gardar os cambios?"
+
+#: mail/mail-errors.xml.in.h:63
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Incapaz de abrir o cartafol de borradores para esta conta.\n"
+"¿Gostaríalle usar o cartafol de borradores por defecto?"
+
+#: mail/mail-errors.xml.in.h:64
+#, fuzzy
+msgid "Use _Default"
+msgstr "Por de_fecto"
+
+#: mail/mail-errors.xml.in.h:65
+#, fuzzy
+msgid "Use default drafts folder?"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-errors.xml.in.h:66
+msgid "You have not filled in all of the required information."
+msgstr "Non encheu toda a información requirida."
+
+#: mail/mail-errors.xml.in.h:67
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:68
+msgid "You may not create two accounts with the same name."
+msgstr "Non pode crear dúas contas co mesmo nome"
+
+#: mail/mail-errors.xml.in.h:69
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:70
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:71
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:72
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Baleirar _Lixo"
+
+#: mail/mail-errors.xml.in.h:73
+#, fuzzy
+msgid "_Expunge"
+msgstr "_Limpar"
+
+#: mail/mail-errors.xml.in.h:74
+#, fuzzy
+msgid "_Send"
+msgstr "Enviar"
+
+#: mail/mail-errors.xml.in.h:75
+#, fuzzy
+msgid "vFolders automatically updated."
+msgstr "Actualizar automaticamente"
+
+#: mail/mail-errors.xml.in.h:76
+msgid "{0}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:77
+msgid "{0}."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:78
+msgid "{1}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:79
+msgid "{1}."
+msgstr ""
+
+#: mail/mail-folder-cache.c:786
+#, fuzzy, c-format
+msgid "Pinging %s"
+msgstr "Examinando %s"
+
+#: mail/mail-mt.c:897
 msgid "Working"
 msgstr "Traballando"
 
@@ -15613,127 +16067,127 @@ msgstr "Filtrando o Cartafol"
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:534
+#: mail/mail-ops.c:532
 #, 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:559
+#: mail/mail-ops.c:557
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:566
 #, 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:664
+#: mail/mail-ops.c:662
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:693
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:697
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:796
+#: mail/mail-ops.c:794
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1123
+#: mail/mail-ops.c:1105
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1166
+#: mail/mail-ops.c:1148
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1220
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1392
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1475
+#: mail/mail-ops.c:1457
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1476
+#: mail/mail-ops.c:1458
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1513
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1567 mail/mail-ops.c:1618
+#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1615
+#: mail/mail-ops.c:1597
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1616
+#: mail/mail-ops.c:1598
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1681
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1771
+#: mail/mail-ops.c:1753
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recibindo %d mensaxe(s)"
 msgstr[1] "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1839
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Gardando %d mensaxe(s)"
 msgstr[1] "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1889
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15742,7 +16196,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15751,11 +16205,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:1988
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2005
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15764,17 +16218,17 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
@@ -15804,101 +16258,76 @@ msgstr ""
 msgid "Security Information"
 msgstr "Información da Fonte"
 
-#: mail/mail-send-recv.c:156
+#: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:263
+#: mail/mail-send-recv.c:264
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:265
+#: mail/mail-send-recv.c:266
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:268
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:317
+#: mail/mail-send-recv.c:320
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:320
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:401
+#: mail/mail-send-recv.c:412
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:236
+#: mail/mail-session.c:237
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:270
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:295
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:299
+#: mail/mail-session.c:296
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:86
-#, fuzzy, c-format
-msgid "Could not save signature file: %s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: mail/mail-signature-editor.c:233
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta sinatura cambiou, pero non se gravou.\n"
-"\n"
-"¿Desexa gardar os cambios?"
-
-#: mail/mail-signature-editor.c:236
-msgid "_Discard changes"
-msgstr ""
-
-#: mail/mail-signature-editor.c:240
-msgid "Save signature"
-msgstr "Gravar sinatura"
-
-#: mail/mail-signature-editor.c:388
+#: mail/mail-signature-editor.c:371
 #, fuzzy
 msgid "Edit signature"
 msgstr "Engadir criterio"
 
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:411
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-signature-editor.c:431
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "Nome:"
 
@@ -15938,95 +16367,81 @@ msgstr "Creando o cartafol %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:525
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-vfolder.c:926
+#: mail/mail-vfolder.c:922
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:961
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:985
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr ""
-
-#: mail/mail-vfolder.c:1057
+#: mail/mail-vfolder.c:1045
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:933
+#: mail/message-list.c:911
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:934
+#: mail/message-list.c:912
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:913
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:914
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:915
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:919
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:920
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:924
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:925
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:1268
+#: mail/message-list.c:1244
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1275
+#: mail/message-list.c:1251
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1284
+#: mail/message-list.c:1260
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1296
+#: mail/message-list.c:1272
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1304
+#: mail/message-list.c:1280
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1306
+#: mail/message-list.c:1282
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3103
+#: mail/message-list.c:3109
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -16101,7 +16516,7 @@ msgstr "Responder a Todos"
 msgid "Review"
 msgstr "Previsualizar"
 
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16287,11 +16702,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:146
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:148
+#: shell/e-shell-importer.c:149
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16305,16 +16720,16 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará "
 "averigualo."
 
-#: shell/e-shell-importer.c:154
+#: shell/e-shell-importer.c:155
 #, fuzzy
 msgid "Choose the destination for this import"
 msgstr "Cancela-la xuntanza deste elemento"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:160
+#: shell/e-shell-importer.c:161
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -16322,7 +16737,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16331,31 +16746,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:332
+#: shell/e-shell-importer.c:333
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:457
+#: shell/e-shell-importer.c:459
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:465
+#: shell/e-shell-importer.c:467
 #, fuzzy, c-format
 msgid "Importing %s.\n"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:492
+#: shell/e-shell-importer.c:495
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16364,34 +16779,34 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:546
+#: shell/e-shell-importer.c:549
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:595
+#: shell/e-shell-importer.c:598
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:603
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:610
+#: shell/e-shell-importer.c:613
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:649
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:655
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16399,26 +16814,26 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuracións existentes"
 
-#: shell/e-shell-importer.c:724
+#: shell/e-shell-importer.c:727
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
+#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1037
+#: shell/e-shell-importer.c:1044
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
 
-#: shell/e-shell-importer.c:1049
+#: shell/e-shell-importer.c:1056
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: shell/e-shell-importer.c:1159
+#: shell/e-shell-importer.c:1169
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
@@ -16427,16 +16842,16 @@ msgstr "Importar"
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-settings-dialog.c:327
+#: shell/e-shell-settings-dialog.c:323
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-startup-wizard.c:570
+#: shell/e-shell-startup-wizard.c:575
 msgid "Starting import"
 msgstr "Comezando a importación"
 
-#: shell/e-shell-startup-wizard.c:785
+#: shell/e-shell-startup-wizard.c:795
 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 "
@@ -16503,18 +16918,18 @@ msgstr "_Traballar Desconectado"
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-window.c:327
+#: shell/e-shell-window.c:338
 #, 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-window.c:334
+#: shell/e-shell-window.c:345
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution está desconectándose"
 
-#: shell/e-shell-window.c:340
+#: shell/e-shell-window.c:351
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -16549,11 +16964,11 @@ msgstr "Erro xenérico"
 msgid "Checkbox"
 msgstr "Chile"
 
-#: shell/e-user-creatable-items-handler.c:683
+#: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-shell-component-utils.c:124
+#: shell/evolution-shell-component-utils.c:115
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -16561,7 +16976,7 @@ msgid ""
 "Unknown error."
 msgstr "Erro descoñecido"
 
-#: shell/evolution-shell-component-utils.c:127
+#: shell/evolution-shell-component-utils.c:118
 #, c-format
 msgid ""
 "%s\n"
@@ -16570,7 +16985,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:134
+#: shell/evolution-shell-component-utils.c:125
 #, c-format
 msgid ""
 "%s\n"
@@ -16709,7 +17124,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:230
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16741,7 +17156,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:255
+#: shell/main.c:254
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16750,44 +17165,44 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:261
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:392
+#: shell/main.c:391
 #, fuzzy
 msgid "Cannot register the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:401
+#: shell/main.c:400
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:498
+#: shell/main.c:497
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:499
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:502
+#: shell/main.c:501
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:505
+#: shell/main.c:504
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:509
+#: shell/main.c:508
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:512
+#: shell/main.c:511
 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."
 
@@ -17664,13 +18079,6 @@ msgstr "Gravar este elemento no disco"
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Gardar"
-
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
@@ -17712,6 +18120,13 @@ msgstr "Gardar o contacto e pechar a caixa de diálogo"
 msgid "Send _Message to Contact..."
 msgstr "Enviar unha _Mensaxe ao Contacto..."
 
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Gardar"
+
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Borrar esta lista"
@@ -18893,20 +19308,28 @@ msgstr "Establecer Estado"
 msgid "_Tasks"
 msgstr "_Tarefa"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
 msgstr ""
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "Seleccionar un Fuso Horario"
+#, fuzzy
+msgid "<b>Time Zones</b>"
+msgstr "Fusos Horarios"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Fusos Horarios"
+#, fuzzy
+msgid "<b>_Selection</b>"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "Seleccionar un Fuso Horario"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 #, fuzzy
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
@@ -18917,11 +19340,6 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o botón dereito para alonxarse."
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
-msgid "_Selection:"
-msgstr "Selección:"
-
 #: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr "_Vista Actual"
@@ -18966,88 +19384,88 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Báltico"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Europeo Central"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Chinés"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Grego"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Turco"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:72
+#: widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: widgets/misc/e-charset-picker.c:73
+#: widgets/misc/e-charset-picker.c:74
 #, fuzzy
 msgid "Western European, New"
 msgstr "Europeo Occidental"
 
-#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:99
+#: widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:103
 #, fuzzy
 msgid "Visual"
 msgstr "Alarmas Visuais"
 
-#: widgets/misc/e-charset-picker.c:170
+#: widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Xogo de caracteres descoñecido: %s"
 
-#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Codificación dos Caracteres"
 
-#: widgets/misc/e-charset-picker.c:224
+#: widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:320
+#: widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Outro..."
 
@@ -19113,17 +19531,17 @@ msgstr ""
 msgid "Spacing around expander arrow"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:195
 #, fuzzy
 msgid "_Searches"
 msgstr "_Buscar"
 
-#: widgets/misc/e-filter-bar.c:193
+#: widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:214
+#: widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Gardar Busca"
 
@@ -19191,6 +19609,313 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
 #, fuzzy
+#~ msgid "New Address Book"
+#~ msgstr "Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "O URI que ha amosar a axenda"
+
+#, fuzzy
+#~ msgid "The URI that the address book will display"
+#~ msgstr "O URI que ha amosar a axenda"
+
+#, fuzzy
+#~ msgid "Address Book Creation Assistant"
+#~ msgstr "Fontes do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "Finished"
+#~ msgstr "B_uscar"
+
+#, fuzzy
+#~ msgid "Group:"
+#~ msgstr "Grupo"
+
+#, fuzzy
+#~ msgid "Step 3: Connecting to Server"
+#~ msgstr "Conectando ao servidor..."
+
+#, fuzzy
+#~ msgid "Step 4: Searching the Directory"
+#~ msgstr "Conectando ao servidor..."
+
+#, 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."
+
+#, fuzzy
+#~ msgid " B_usiness:"
+#~ msgstr "T_raballo"
+
+#, fuzzy
+#~ msgid "A_ddress..."
+#~ msgstr "_Enderezo..."
+
+#, fuzzy
+#~ msgid "A_ssistant's name:"
+#~ msgstr "Nome do _asistente:"
+
+#, fuzzy
+#~ msgid "Addressbook:"
+#~ msgstr "Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "Blog address:"
+#~ msgstr "Enderezo de Correo:"
+
+#, fuzzy
+#~ msgid "Business fa_x:"
+#~ msgstr "Fax do Traballo"
+
+#, fuzzy
+#~ msgid "File a_s:"
+#~ msgstr "Ar_quivar coma:"
+
+#~ msgid "New phone type"
+#~ msgstr "Novo tipo de teléfono"
+
+#~ msgid "Organi_zation:"
+#~ msgstr "Organi_zación:"
+
+#, fuzzy
+#~ msgid "Primary _email:"
+#~ msgstr "Correo Electrónico Principal"
+
+#, fuzzy
+#~ msgid "S_pouse:"
+#~ msgstr "_Cónxuxe:"
+
+#~ msgid "_Add"
+#~ msgstr "_Engadir"
+
+#, fuzzy
+#~ msgid "_Business:"
+#~ msgstr "_Traballo"
+
+#, fuzzy
+#~ msgid "_Categories..."
+#~ msgstr "Ca_tegorías..."
+
+#, fuzzy
+#~ msgid "_Home:"
+#~ msgstr "_Particular"
+
+#, fuzzy
+#~ msgid "_Manager's name:"
+#~ msgstr "Nome do _Administrador:"
+
+#, fuzzy
+#~ msgid "_Mobile:"
+#~ msgstr "_Móbil"
+
+#~ msgid "_Office:"
+#~ msgstr "_Oficina:"
+
+#, fuzzy
+#~ msgid "_Public Calendar URL:"
+#~ msgstr "Imprimir Axenda"
+
+#, fuzzy
+#~ msgid "_This is the mailing address"
+#~ msgstr "_Este é o enderezo de correo"
+
+#~ msgid "_Web page address:"
+#~ msgstr "Enderezo da páxina _Web:"
+
+#~ msgid "Account Name"
+#~ msgstr "Nome da Conta"
+
+#, fuzzy
+#~ msgid "Save Contact as VCard"
+#~ msgstr "Gardar como VCard"
+
+#~ msgid "Business"
+#~ msgstr "Traballo"
+
+#, fuzzy
+#~ msgid "Calendar Creation Assistant"
+#~ msgstr "Fontes do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "Task List Creation Assistant"
+#~ msgstr "Fontes do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "Start Date:"
+#~ msgstr "Data de _Inicio:"
+
+#, fuzzy
+#~ msgid "Due Date:"
+#~ msgstr "_Data Límite"
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_Prioridade:"
+
+#~ msgid ""
+#~ "Error while reading file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro ao le-lo ficheiro %s:\n"
+#~ "%s"
+
+#~ msgid "Error saving file: %s"
+#~ msgstr "Erro ao gardar o ficheiro: %s"
+
+#~ msgid "Error loading file: %s"
+#~ msgstr "Erro ao cargar o ficheiro: %s"
+
+#~ msgid "Error accessing file: %s"
+#~ msgstr "Erro ao acceder ao ficheiro: %s"
+
+#~ msgid ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non é posible desprazarse no ficheiro: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to truncate file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible trunca-lo ficheiro: %s\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to copy file descriptor: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non é posible desprazarse no ficheiro: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Erro ao autogardar a mensaxe: %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
+#~ "Would you like to try to recover them?"
+#~ msgstr ""
+#~ "Evolution atopou ficheiros non gravados dunha sesión anterior.\n"
+#~ "¿Gostaríalle probar a recuperalos?"
+
+#, fuzzy
+#~ msgid ""
+#~ "The message \"%s\" has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Esta mensaxe non foi enviada.\n"
+#~ "\n"
+#~ "¿Desexa gardar os cambios?"
+
+#, fuzzy
+#~ msgid "You need to to specify at least one folder as a source."
+#~ msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
+
+#, fuzzy
+#~ msgid "You must specify a valid script name."
+#~ msgstr "Nome do estilo:"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Esta mensaxe non ten asunto.\n"
+#~ "¿Enviar realmente?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Xa que a lista de contactos á que envía está configurada para agocha-los "
+#~ "enderezos da lista, esta mensaxe só ha conter destinatarios Bcc."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Esta mensaxe só contén destinatarios Bcc."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "É posible que o servidor de correo revele os destinatarios engadindo unha "
+#~ "cabeceira Apparently-To.\n"
+#~ "¿Enviar de todas maneiras?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
+
+#, fuzzy
+#~ msgid "Cannot move folder `%s': illegal operation"
+#~ msgstr "Non foi posible renomear o cartafol: %s"
+
+#, fuzzy
+#~ msgid "%s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "Could not delete folder: %s"
+#~ msgstr "Non foi posible borrar o cartafol `%s': %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "%s xa existe\n"
+#~ "¿Quere sobrescribilo?"
+
+#, fuzzy
+#~ msgid "Error: '%s' exists and is not a regular file"
+#~ msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+
+#, fuzzy
+#~ 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?"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "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?"
+
+#~ msgid "Save signature"
+#~ msgstr "Gravar sinatura"
+
+#, fuzzy
+#~ msgid "_Selection:"
+#~ msgstr "Selección:"
+
+#, fuzzy
 #~ msgid "New Addressbook Book"
 #~ msgstr "Libro de Enderezos"
 
@@ -19398,10 +20123,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Nome do Servidor"
 
 #, fuzzy
-#~ msgid "Search base:"
-#~ msgstr "_Base da busca:"
-
-#, fuzzy
 #~ msgid "STARTTLS request timed out: %s"
 #~ msgstr "A petición AUTH expirou: %s"
 
@@ -19517,10 +20238,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "[script]"
 #~ msgstr "descrición"
 
-#, fuzzy
-#~ msgid "Add script signature"
-#~ msgstr "Engadir criterio"
-
 #~ msgid "Current store format:"
 #~ msgstr "Formato de armacenamento actual:"
 
@@ -19557,9 +20274,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Account Information"
 #~ msgstr "Información de Contas"
 
-#~ msgid "Authentication"
-#~ msgstr "Autenticación"
-
 #, fuzzy
 #~ msgid "Composing Messages"
 #~ msgstr "Compoñer unha mensaxe"
@@ -19596,9 +20310,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Message Fonts"
 #~ msgstr "A mensaxe contén"
 
-#~ msgid "Optional Information"
-#~ msgstr "Información Opcional"
-
 #, fuzzy
 #~ msgid "Printed Fonts"
 #~ msgstr "Imprimi-los contactos seleccionados"
@@ -19740,16 +20451,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Scanning directory"
 #~ msgstr "Explorando o directorio"
 
-#, fuzzy
-#~ msgid "Cannot copy folder: %s"
-#~ msgstr "Non é posible obter o cartafol: %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot move folder: %s"
-#~ msgstr ""
-#~ "Non foi posible borrar o cartafol:\n"
-#~ "%s"
-
 #~ msgid "Cannot move a folder over itself."
 #~ msgstr "Non se pode mover un cartafol a si mesmo."
 
@@ -19773,13 +20474,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Move Folder"
 #~ msgstr "Mover cartafol"
 
-#~ msgid ""
-#~ "Cannot delete folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non foi posible borrar o cartafol:\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "Really delete folder \"%s\"?"
 #~ msgstr "Elimina-lo cartafol '%s'"
@@ -19831,10 +20525,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Show the shortcuts as large icons"
 #~ msgstr "Amosar os atallos como iconas grandes"
 
-#, fuzzy
-#~ msgid "_Add Group..."
-#~ msgstr "_Novo Grupo..."
-
 #~ msgid "_Remove this Group..."
 #~ msgstr "_Eliminar este Grupo..."
 
@@ -19886,9 +20576,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Remove this shortcut from the shortcut bar"
 #~ msgstr "Eliminar este atallo da barra de atallos"
 
-#~ msgid "Error saving shortcuts."
-#~ msgstr "Erro ao gardar os atallos."
-
 #~ msgid "Shortcuts"
 #~ msgstr "Atallos"
 
@@ -20070,18 +20757,10 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Alarm Email</b>"
-#~ msgstr "Enviando Correo"
-
-#, fuzzy
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>Descrición:</b> %s"
-
-#, fuzzy
 #~ msgid "<b>Reminders</b>"
 #~ msgstr "Recordatorios"
 
@@ -20094,10 +20773,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "Semana Laboral"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Clasificación"
 
@@ -20110,12 +20785,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Descrición:"
 
 #, fuzzy
-#~ msgid "<b>L_ocation</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "Localización Xeográfica: "
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Resumo:</b> %s<br><br>"
 
@@ -20135,10 +20804,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "<b>Progress</b>"
 #~ msgstr "En Progreso"
 
-#, fuzzy
-#~ msgid "<b>Web Page</b>"
-#~ msgstr "Enviando Correo"
-
 #~ msgid "The method required to load `%s' is not supported"
 #~ msgstr "O método requirido para cargar `%s' non está soportado"
 
@@ -20164,15 +20829,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Non foi posible actualizar os ficheiros correctamente"
 
 #~ msgid ""
-#~ "Cannot create the directory\n"
-#~ "%s\n"
-#~ "Error: %s"
-#~ msgstr ""
-#~ "Non se pode crear o directorio\n"
-#~ "%s\n"
-#~ "Erro: %s"
-
-#~ msgid ""
 #~ "An error occurred in copying files into\n"
 #~ "`%s'."
 #~ msgstr ""
@@ -20726,9 +21382,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Callback"
 #~ msgstr "Resposta"
 
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
 #, fuzzy
 #~ msgid "Comp"
 #~ msgstr "Copiar"
@@ -20932,15 +21585,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "The signature certificate for \"%s\" does not exist."
 #~ msgstr "O certificado da sinatura de \"%s\" non existe."
 
-#~ msgid "The encryption certificate for \"%s\" does not exist."
-#~ msgstr "O certificado de cifrado de \"%s\" non existe."
-
-#~ msgid "Failed to find certificate for \"%s\"."
-#~ msgstr "Non se puido atopa-lo certificado de \"%s\"."
-
-#~ msgid "Failed to find a common bulk algorithm."
-#~ msgstr "Non se puido atopar un algoritmo bulk común."
-
 #, fuzzy
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Non foi posible crear un contexto de sinatura PGP."
@@ -21061,9 +21705,6 @@ msgstr "%s (%d%% completa)"
 #~ "Só pode reenviar mensaxes\n"
 #~ "do cartafol de Enviadas."
 
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
-
 #~ msgid "No Message Selected"
 #~ msgstr "Ningunha Mensaxe Seleccionada"
 
@@ -21073,11 +21714,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Printing of message failed"
 #~ msgstr "A impresión da mensaxe fallou"
 
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "¿Está seguro de que quere abrir todas as %d mensaxes en fiestras "
-#~ "separadas?"
-
 #~ msgid "Could not create a S/MIME signature context."
 #~ msgstr "Non foi posible crear un contexto de sinatura S/MIME."
 
@@ -21090,9 +21726,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Could not create a S/MIME envelope context."
 #~ msgstr "Non foi posible crear un contexto de sobre S/MIME."
 
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Non foi posible crear un contexto de descodificación S/MIME."
-
 #, fuzzy
 #~ msgid ""
 #~ "File `%s' already exists.\n"
@@ -21114,10 +21747,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "External Viewer"
 #~ msgstr "Visualizador Externo"
 
-#, fuzzy
-#~ msgid "Downloading images"
-#~ msgstr "Cargar _Imaxes"
-
 #~ msgid "Loading message content"
 #~ msgstr "Cargado o contido da mensaxe"
 
@@ -25476,10 +26105,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Fonte de Novas"
 
 #, fuzzy
-#~ msgid "_URL:"
-#~ msgstr "URL:"
-
-#, fuzzy
 #~ msgid "Error downloading RDF"
 #~ msgstr "<b>Erro descargando o RDF</b>"
 
@@ -26987,9 +27612,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Imports Outlook Express 4 files into Evolution"
 #~ msgstr "Importa ficheiros de Outlook Express 4 a Evolution"
 
-#~ msgid "Really delete account?"
-#~ msgstr "¿Borrar esta conta de verdade?"
-
 #, fuzzy
 #~ msgid "Go to next folder with unread messages?"
 #~ msgstr "Amosa-la seguinte mensaxe sen ler"
@@ -27603,13 +28225,6 @@ msgstr "%s (%d%% completa)"
 
 #~ msgid ""
 #~ "\n"
-#~ "  Postal Code: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Código Postal: "
-
-#~ msgid ""
-#~ "\n"
 #~ "  Country:     "
 #~ msgstr ""
 #~ "\n"
@@ -28053,9 +28668,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Qmail maildir-format mail files"
 #~ msgstr "Ficheiros de correo con formato maildir de Qmail"
 
-#~ msgid "Summarising folder"
-#~ msgstr "Resumindo cartafol"
-
 #~ msgid "Could not open folder: %s: summarising from position %ld: %s"
 #~ msgstr ""
 #~ "Non foi posible abir o cartafol: %s: resumindo desde a posición %ld: %s"
@@ -28297,9 +28909,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Mensaxe remitida:\n"
 
-#~ msgid "Each account must have a different name."
-#~ msgstr "Cada conta ten que ter un nome diferente."
-
 #~ msgid "Message _preview should be displayed by default"
 #~ msgstr "Debe amosarse a _previsualización da mensaxe por defecto"
 
@@ -28649,9 +29258,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Test bonobo service"
 #~ msgstr "Comprobar servicio bonobo"
 
-#~ msgid "Update automatically"
-#~ msgstr "Actualizar automaticamente"
-
 #~ msgid "Forward to Address"
 #~ msgstr "Reenviar ó Enderezo"
author	Jeffrey Stedfast <fejj@src.gnome.org>	2004-04-30 23:01:36 +0800
committer	Jeffrey Stedfast <fejj@src.gnome.org>	2004-04-30 23:01:36 +0800
commit	1c8f61ea0bea3c97d3b6339a989882ab2180749a (patch)
tree	b381ee25a790ae7ab0110d9ae2044ec915227212 /po/gl.po
parent	448012d42619872149723008d6490497ed24618a (diff)
download	gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.gz gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.zst gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.zip